LimeSurvey: develop 5aae5f25
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-11-06 12:49:13 | develop 2d58085c |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - .travis.yml | Diff File | |||
| mod - application/config/packages.php | Diff File | |||
| mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php | Diff File | |||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | |||
| mod - application/helpers/common_helper.php | Diff File | |||
| mod - application/helpers/export_helper.php | Diff File | |||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | |||
| mod - application/models/TemplateConfig.php | Diff File | |||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | |||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | |||
| mod - application/views/admin/super/footer.php | Diff File | |||
| mod - application/views/admin/survey/Question/advanced_settings_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | |||
| mod - application/views/admin/survey/Question/question_view.php | Diff File | |||
| mod - application/views/admin/survey/QuestionGroups/group_view.php | Diff File | |||
| mod - assets/packages/adminbasics/build/adminbasics.css | Diff File | |||
| mod - assets/packages/adminbasics/build/adminbasics.debug.js | Diff File | |||
| mod - assets/packages/adminbasics/build/adminbasics.js | Diff File | |||
| mod - assets/packages/adminbasics/build/adminbasics.min.css | Diff File | |||
| mod - assets/packages/adminbasics/build/adminbasics.min.js | Diff File | |||
| mod - assets/packages/adminbasics/scss/main.scss | Diff File | |||
| mod - assets/packages/adminbasics/src/adminbasicsmain.js | Diff File | |||
| mod - assets/packages/adminbasics/src/parts/globalMethods.js | Diff File | |||
| mod - assets/packages/emailtemplates/emailtemplates.js | Diff File | |||
| mod - assets/packages/emailtemplates/emailtemplates.min.js | Diff File | |||
| mod - assets/packages/emailtemplates/popup-dialog.css | Diff File | |||
| mod - assets/packages/limesurvey/survey.js | Diff File | |||
| mod - assets/packages/template-core/template-core.css | Diff File | |||
| mod - assets/scripts/admin/questions.js | Diff File | |||
| mod - framework/yiilite.php | Diff File | |||
| mod - tests/data/travis/travis_setup.sh | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/clearall_buttons.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/save_buttons.twig | Diff File | |||
