LimeSurvey: answers_html 6ffb10e9

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-10-24 22:07:22 answers_html 1684e94b
Changeset

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

Conflicts:

application/config/version.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
add - application/views/admin/conditions/includes/quickAddConditionForm.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/super/_question_explorer.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_css_class.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_questions_other.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_statistics_options.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_tabs.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/survey/questions/date/selector/answer.php 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/de.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.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/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/conditions.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/date.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css Diff File
mod - styles/Bay_of_Many/css/lime-admin-common.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css Diff File
mod - styles/Black_Pearl/css/lime-admin-common.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css Diff File
mod - styles/Dark_Sky/css/lime-admin-common.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css Diff File
mod - styles/Free_Magenta/css/lime-admin-common.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css Diff File
mod - styles/Purple_Tentacle/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-common-rtl.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css Diff File
mod - styles/Sunset_Orange/css/lime-admin-common.css Diff File
mod - third_party/kcfinder/conf/upload.htaccess Diff File