LimeSurvey: develop 3a7bbff2

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-10-25 15:18:15 develop 60669dce
Changeset

Merge branch 'master' into develop

Conflicts:
application/helpers/expressions/em_manager_helper.php
application/libraries/PluginManager/PluginManager.php
mod - .gitignore Diff File
mod - application/config/questiontypes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/Response.php Diff File
mod - application/views/survey/questions/answer/list_with_comment/dropdown/answer.twig Diff File
mod - application/views/survey/questions/answer/ranking/answer.twig Diff File
mod - application/views/survey/questions/answer/yesno/buttons/item.twig Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js 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/cs/cs.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es-AR/es-AR.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/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/zh-Hans/zh-Hans.mo Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/answer.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/assets/scripts/bootstrapbuttons.css Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/config.xml Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.css Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml Diff File
rm - third_party/jquery-actual/.gitignore Diff File
rm - third_party/jquery-actual/CHANGELOG.md Diff File
mod - third_party/jquery-actual/README.md Diff File
rm - third_party/jquery-actual/demo/PIE.htc Diff File
rm - third_party/jquery-actual/demo/css3pie.html Diff File
rm - third_party/jquery-actual/demo/normal.html Diff File
mod - third_party/jquery-actual/jquery.actual.js Diff File
mod - third_party/jquery-actual/jquery.actual.min.js Diff File
rm - third_party/jquery-actual/package.json Diff File
add - upload/themes/survey/generalfiles/index.html Diff File