LimeSurvey: develop 16702ee4
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| c_schmitz | c_schmitz | develop | 2018-03-14 11:21:17 | develop d65e432b |
| Changeset | Dev Merge branch 'master' into develop Resolved conflicts:application/config/version.phpapplication/controllers/admin/surveyadmin.phpapplication/helpers/expressions/em_manager_helper.phpapplication/models/Survey.phpapplication/models/Tutorial.phpapplication/views/admin/survey/surveySummary_view.php |
|||
| mod - .gitignore | Diff File | |||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/InstallerController.php | Diff File | |||
| mod - application/controllers/admin/checkintegrity.php | Diff File | |||
| mod - application/controllers/admin/database.php | Diff File | |||
| mod - application/controllers/admin/globalsettings.php | Diff File | |||
| mod - application/controllers/admin/questions.php | Diff File | |||
| mod - application/controllers/admin/surveyadmin.php | Diff File | |||
| mod - application/core/LsDefaultDataSets.php | Diff File | |||
| add - application/extensions/admin/TextDisplaySwitch/README.md | Diff File | |||
| add - application/extensions/admin/TextDisplaySwitch/TextDisplaySwitch.php | Diff File | |||
| add - application/extensions/admin/TextDisplaySwitch/assets/textDisplaySwitch.js | Diff File | |||
| add - application/extensions/admin/TextDisplaySwitch/views/default.php | Diff File | |||
| add - application/extensions/admin/TextDisplaySwitch/views/short.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/admin/export/SurveyDao.php | Diff File | |||
| mod - application/helpers/admin/survey_helper.php | Diff File | |||
| mod - application/helpers/common_helper.php | Diff File | |||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/helpers/qanda_helper.php | Diff File | |||
| mod - application/helpers/questionHelper.php | Diff File | |||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | |||
| mod - application/helpers/update/update_helper.php | Diff File | |||
| mod - application/helpers/update/updatedb_helper.php | Diff File | |||
| mod - application/helpers/viewHelper.php | Diff File | |||
| mod - application/models/Survey.php | Diff File | |||
| mod - application/models/SurveyLanguageSetting.php | Diff File | |||
| mod - application/models/TemplateConfig.php | Diff File | |||
| mod - application/models/Tutorial.php | Diff File | |||
| mod - application/views/admin/checkintegrity/check_view.php | Diff File | |||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | |||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | |||
| mod - application/views/admin/export/statistics_user_view.php | Diff File | |||
| mod - application/views/admin/export/statistics_view.php | Diff File | |||
| mod - application/views/admin/global_settings/_email.php | Diff File | |||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/massive_actions/_selector.php | Diff File | |||
| mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php | Diff File | |||
| mod - application/views/admin/survey/breadcrumb.php | Diff File | |||
| mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_presentation_panel.php | Diff File | |||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | |||
| mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig | Diff File | |||
| rm - assets/packages/adminpanel/.eslint.json | Diff File | |||
| mod - assets/packages/adminpanel/.eslintrc.json | Diff File | |||
| mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | |||
| mod - assets/packages/adminpanel/build/lsadminpanel.debug.js | Diff File | |||
| mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | |||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.css | Diff File | |||
| mod - assets/packages/adminpanel/build/lsadminpanel.min.js | Diff File | |||
| mod - assets/packages/adminpanel/package.json | Diff File | |||
| mod - assets/packages/adminpanel/scss/custom.scss | Diff File | |||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | |||
| mod - assets/packages/adminpanel/src/main.js | Diff File | |||
| mod - assets/packages/adminpanel/yarn.lock | Diff File | |||
| mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js | Diff File | |||
| mod - assets/scripts/admin/statistics.js | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - installer/create-database.php | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/ca/ca.mo | Diff File | |||
| mod - locale/de-informal/de-informal.mo | Diff File | |||
| mod - locale/fr/fr.mo | Diff File | |||
| mod - locale/nb/nb.mo | Diff File | |||
| mod - locale/pl/pl.mo | Diff File | |||
| mod - themes/survey/bootswatch/css/theme.css | Diff File | |||
| mod - themes/survey/fruity/css/theme.css | Diff File | |||
| mod - themes/survey/vanilla/css/theme.css | Diff File | |||
| mod - themes/survey/vanilla/scripts/theme.js | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/firstpage.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/warnings.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/privacy/privacy.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig | Diff File | |||
| add - themes/survey/vanilla/views/subviews/privacy/privacy_text.twig | Diff File | |||
