LimeSurvey: develop 8a54a919
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| ollehar | ollehar | develop | 2018-03-20 14:33 | develop 5213972a |
| Changeset | Merge branch 'master' into develop Conflicts: |
|||
| mod - application/config/config-defaults.php | Diff File | |||
| mod - application/config/packages.php | Diff File | |||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/admin/checkintegrity.php | Diff File | |||
| mod - application/controllers/admin/questiongroups.php | Diff File | |||
| mod - application/controllers/admin/themes.php | Diff File | |||
| mod - application/helpers/update/updatedb_helper.php | Diff File | |||
| mod - application/models/Question.php | Diff File | |||
| mod - application/models/TemplateConfiguration.php | Diff File | |||
| mod - application/models/TemplateManifest.php | Diff File | |||
| mod - application/views/admin/survey/prepareEditorScript_view.php | Diff File | |||
| mod - application/views/admin/survey/subview/_create_survey_text.php | Diff File | |||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | 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/adminpanel/src/components/subcomponents/_questionsgroups.vue | Diff File | |||
| mod - assets/packages/adminpanel/src/main.js | Diff File | |||
| mod - assets/scripts/admin/assessments.js | Diff File | |||
| mod - assets/scripts/admin/statistics.js | Diff File | |||
| rm - assets/scripts/numerical_input.js | Diff | |||
| mod - docs/release_notes.txt | Diff File | |||
| mod - locale/_template/limesurvey.pot | Diff File | |||
| mod - locale/ar/ar.mo | Diff File | |||
| mod - locale/ca/ca.mo | Diff File | |||
| mod - locale/da/da.mo | Diff File | |||
| mod - locale/de-informal/de-informal.mo | Diff File | |||
| mod - locale/de/de.mo | Diff File | |||
| mod - locale/es/es.mo | Diff File | |||
| mod - locale/fr/fr.mo | Diff File | |||
| mod - locale/hu/hu.mo | Diff File | |||
| mod - locale/ja/ja.mo | Diff File | |||
| mod - locale/mya/mya.mo | Diff File | |||
| mod - locale/nb/nb.mo | Diff File | |||
| mod - locale/nl-informal/nl-informal.mo | Diff File | |||
| mod - locale/nl/nl.mo | Diff File | |||
| mod - locale/pl/pl.mo | Diff File | |||
| mod - themes/survey/fruity/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/options/options.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_errors.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_global.twig | Diff File | |||
| mod - themes/survey/vanilla/views/layout_survey_list.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/content/clearall.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/header/start_form.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/logincomponents/captcha.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/messages/welcome.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/clearall_links.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/navigation/language_changer_top_menu.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_upload-files.twig | Diff File | |||
| mod - themes/survey/vanilla/views/subviews/registration/register_message.twig | Diff File | |||
