LimeSurvey: develop 2d58085c

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2018-11-02 10:56 develop 82dae617
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

Conflicts:

application/config/version.php

application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row_other.twig

application/views/survey/questions/answer/multiplenumeric/rows/input/answer_row.twig

application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig

application/views/survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.twig
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/SurveysGroupsController.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/views/survey/questions/answer/5pointchoice/rows/item_row.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/answer.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/rows/day.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/rows/hour.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/rows/minute.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/rows/month.twig Diff File
mod - application/views/survey/questions/answer/date/dropdown/rows/year.twig Diff File
mod - application/views/survey/questions/answer/date/selector/answer.twig Diff File
mod - application/views/survey/questions/answer/gender/buttons/answer.twig Diff File
mod - application/views/survey/questions/answer/gender/radio/answer.twig Diff File
mod - application/views/survey/questions/answer/language/answer.twig Diff File
mod - application/views/survey/questions/answer/list_dropdown/answer.twig Diff File
mod - application/views/survey/questions/answer/list_with_comment/list/rows/answer_row.twig Diff File
mod - application/views/survey/questions/answer/listradio/rows/answer_row.twig Diff File
mod - application/views/survey/questions/answer/listradio/rows/answer_row_other.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice_with_comments/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row_other.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/answer_input.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/dynamic.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/input/answer_row.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - application/views/survey/questions/answer/multipleshorttext/answer.twig Diff File
mod - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.twig Diff File
mod - application/views/survey/questions/answer/yesno/buttons/item.twig Diff File
mod - application/views/survey/questions/answer/yesno/radio/item.twig Diff File
mod - assets/packages/limesurvey/survey.css Diff File
mod - assets/packages/template-core/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css Diff File
mod - assets/packages/template-core/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css Diff File
mod - assets/packages/template-core/template-core.css Diff File
mod - assets/packages/template-core/template-core.js Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/he/he.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/ro/ro.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/bootstrap_buttons_listradio.png Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/bootstrap_buttons_multiplechoice.png Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File