LimeSurvey: develop d65e432b

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-03-08 13:41 develop 628349ba
Changeset

Dev Merge branch 'master' into develop

Resolved Conflicts:

application/config/internal.php

application/config/version.php

application/controllers/PrintanswersController.php

application/controllers/admin/assessments.php

application/controllers/admin/questions.php

application/controllers/admin/surveyadmin.php

application/helpers/qanda_helper.php

application/models/Survey.php
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themes.php Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/assets/.htaccess Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Template.php Diff File
mod - application/views/admin/assessments/assessments_view.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_modals.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_question_type_select.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/surveymenu_entries/create.php Diff File
mod - application/views/admin/themes/importuploaded_view.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
rm - application/views/survey/questions/answer/date/dropdown/answer.php Diff
add - application/views/survey/questions/answer/date/dropdown/answer.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/datepart.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/datepart.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/day.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/day.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/hour.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/hour.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/minute.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/minute.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/month.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/month.twig Diff File
rm - application/views/survey/questions/answer/date/dropdown/rows/year.php Diff
add - application/views/survey/questions/answer/date/dropdown/rows/year.twig Diff File
rm - application/views/survey/questions/answer/date/selector/answer.php Diff
add - application/views/survey/questions/answer/date/selector/answer.twig Diff File
rm - application/views/survey/questions/answer/multiplechoice/answer.php Diff
add - application/views/survey/questions/answer/multiplechoice/answer.twig Diff File
rm - application/views/survey/questions/answer/multiplechoice/columns/column_footer.php Diff
rm - application/views/survey/questions/answer/multiplechoice/columns/column_header.php Diff
rm - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.php Diff
add - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig 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/limesurvey/survey.css Diff File
mod - assets/packages/limesurvey/survey.js Diff File
mod - assets/scripts/admin/answers.js Diff File
mod - assets/scripts/admin/assessments.js Diff File
mod - assets/scripts/admin/labels.js Diff File
mod - assets/scripts/admin/subquestions.js Diff File
mod - assets/scripts/timer.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/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
add - locale/mya/index.html Diff File
add - 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 - locale/pt-BR/pt-BR.mo Diff File
add - themes/survey/vanilla/views/subviews/content/optin.twig Diff File
add - themes/survey/vanilla/views/subviews/content/optout.twig Diff File
mod - themes/survey/vanilla/views/subviews/header/progress_bar.twig Diff File
mod - themes/survey/vanilla/views/subviews/messages/assessments.twig Diff File