LimeSurvey: develop 81a31a33

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu develop 2019-01-18 20:45 develop 8955a40c
Changeset

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

Conflicts:

application/config/version.php

application/controllers/admin/database.php

application/helpers/expressions/em_manager_helper.php

application/models/Question.php

application/views/admin/survey/Question/editQuestion_view.php

application/views/admin/survey/surveySummary_view.php

application/views/survey/questions/answer/ranking/rows/answer_row.twig

assets/packages/questions/ranking/scripts/ranking.js

docs/release_notes.txt
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/third_party/pchart/pData.class.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themes/templateeditorbar_view.php Diff File
mod - application/views/survey/questions/answer/ranking/rows/answer_row.twig Diff File
mod - assets/fonts/noto.css Diff File
add - assets/packages/bootstrap/img/loader.gif Diff File
mod - assets/packages/bootstrap/yiistrap.css Diff File
mod - assets/packages/bootstrap/yiistrap.min.css Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/packages/questions/ranking/scripts/ranking.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/hr/hr.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 - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - themes/survey/vanilla/views/subviews/navigation/question_index_questions_buttons.twig Diff File