LimeSurvey: develop 360e5853

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-02-23 19:54 develop 31fe5568
Changeset

Dev Merge branch 'master' into develop

Conflicts:

application/config/version.php

application/controllers/admin/questions.php

application/helpers/admin/import_helper.php

application/models/Question.php
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/Token.php Diff File
mod - application/third_party/xlsx_writer/README.md Diff File
mod - application/third_party/xlsx_writer/xlsxwriter.class.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
add - application/views/admin/export/exportresult_panels/_columns-control.php Diff File
add - application/views/admin/export/exportresult_panels/_format.php Diff File
add - application/views/admin/export/exportresult_panels/_general.php Diff File
add - application/views/admin/export/exportresult_panels/_headings.php Diff File
add - application/views/admin/export/exportresult_panels/_range.php Diff File
add - application/views/admin/export/exportresult_panels/_responses.php Diff File
add - application/views/admin/export/exportresult_panels/_single-value.php Diff File
add - application/views/admin/export/exportresult_panels/_token-control.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.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/surveymenu/index.php Diff File
mod - application/views/admin/surveymenu_entries/index.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/installer/optconfig_view.php Diff File
mod - application/views/installer/sidebar_view.php Diff File
add - assets/fonts/DejaVu Fonts License.txt Diff File
add - assets/fonts/DejaVuSans-Bold.ttf Diff File
add - assets/fonts/DejaVuSans-BoldOblique.ttf Diff File
add - assets/fonts/DejaVuSans-ExtraLight.ttf Diff File
add - assets/fonts/DejaVuSans-Oblique.ttf Diff File
add - assets/fonts/DejaVuSans.ttf Diff File
add - assets/fonts/DejaVuSansCondensed-Bold.ttf Diff File
add - assets/fonts/DejaVuSansCondensed-BoldOblique.ttf Diff File
add - assets/fonts/DejaVuSansCondensed-Oblique.ttf Diff File
add - assets/fonts/DejaVuSansCondensed.ttf Diff File
mod - assets/packages/adminbasics/js/bootstrap-remote-modals.js Diff File
mod - assets/packages/expressions/em_javascript.js Diff File
mod - assets/scripts/admin/answers.js Diff File
mod - assets/scripts/admin/listresponse.js Diff File
mod - assets/scripts/dualscale.js Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/de.mo Diff File
mod - locale/fr/fr.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
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 - tests/questions/MultipleChoiceMandatoryWithCommentTest.php Diff File
mod - tests/surveys/LanguageChangerTest.php Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-flexible-column.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_array-flexible-row.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_list-dropdown.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_list-radio.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_list-with-comment.twig Diff File
mod - themes/survey/vanilla/views/subviews/printanswers/question_types/template_ranking.twig Diff File