LimeSurvey: develop a4ec6d97
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-06-19 12:38:22 | develop 33649f57 |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/questiontypes.php | Diff File | |||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/admin/database.php | Diff File | |||
| mod - application/controllers/admin/export.php | Diff File | |||
| mod - application/controllers/admin/printablesurvey.php | Diff File | |||
| mod - application/controllers/survey/index.php | Diff File | |||
| mod - application/core/plugins/ExportR/RSyntaxWriter.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/PreviewModalWidget.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/assets/build.sh | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.css | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.dist.js | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.js | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/assets/previewModalWidget.src.scss | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/views/open_modal_button.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/views/select_modal.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/views/simple_grouped_select.php | Diff File | |||
| add - application/extensions/admin/PreviewModalWidget/views/simple_select.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/admin/statistics_helper.php | Diff File | |||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | |||
| mod - application/helpers/globalsettings_helper.php | Diff File | |||
| mod - application/helpers/qanda_helper.php | Diff File | |||
| mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | |||
| mod - application/helpers/surveytranslator_helper.php | Diff File | |||
| mod - application/models/Question.php | Diff File | |||
| mod - application/models/SurveysGroups.php | Diff File | |||
| mod - application/models/TemplateManifest.php | Diff File | |||
| mod - application/third_party/pclzip/pclzip.lib.php | Diff File | |||
| mod - application/views/admin/export/generatestats/_statisticsoutput_header.php | Diff File | |||
| mod - application/views/admin/super/sidemenu.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - application/views/admin/survey/queXMLSurvey_view.php | Diff File | |||
| mod - application/views/admin/survey/surveybar_displayexport.php | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/texts/answer.twig | Diff File | |||
| mod - application/views/survey/questions/answer/arrays/texts/rows/cells/td_total.twig | Diff File | |||
| mod - assets/packages/adminbasics/css/lime-admin-common.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.js | Diff File | |||
| mod - assets/packages/adminpanel/src/components/sidebar.vue | Diff File | |||
| mod - assets/packages/expressions/em_javascript.js | Diff File | |||
| add - assets/packages/questions/arraynumeric/compile.sh | Diff File | |||
| add - assets/packages/questions/arraynumeric/scripts/array-totalsum.js | Diff File | |||
| add - assets/packages/questions/arraynumeric/scripts/array-totalsum.min.js | Diff File | |||
| mod - assets/packages/questions/ranking/scripts/ranking.js | Diff File | |||
| mod - assets/scripts/admin/questions.js | Diff File | |||
| mod - assets/scripts/array-totalsum.js | Diff File | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/ca/ca.mo | Diff File | |||
| mod - locale/hr/hr.mo | Diff File | |||
| mod - locale/hu/hu.mo | Diff File | |||
| mod - locale/ja/ja.mo | Diff File | |||
| mod - locale/nb/nb.mo | Diff File | |||
| mod - locale/pl/pl.mo | Diff File | |||
| mod - locale/ro/ro.mo | Diff File | |||
| mod - locale/zh-Hant-TW/zh-Hant-TW.mo | Diff File | |||
| mod - tests/controllers/CreateSurveyTest.php | Diff File | |||
| mod - tests/surveys/LanguageChangerTest.php | Diff File | |||
| mod - themes/question/README.md | Diff File | |||
| mod - themes/survey/fruity/css/variations/apple_blossom.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/bay_of_many.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/black_pearl.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/free_magenta.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/purple_tentacle.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/sea_green.css | Diff File | |||
| add - themes/survey/fruity/css/variations/skyline_blue.css | Diff File | |||
| mod - themes/survey/fruity/css/variations/sunset_orange.css | Diff File | |||
| mod - themes/survey/fruity/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/scripts/ajaxify.js | Diff File | |||
| mod - themes/survey/vanilla/scripts/theme.js | Diff File | |||
