LimeSurvey: answers_html-mergedMaster 16a4c8a7

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html-mergedMaster 2016-10-13 18:26:35 answers_html-mergedMaster fd6532d3
Changeset

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

Conflicts:

application/controllers/survey/index.php
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/views/layouts/survey.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/answer.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row.php Diff File
mod - application/views/survey/questions/multiplechoice_with_comments/rows/answer_row_other.php Diff File
mod - application/views/survey/questions/multiplenumeric/answer.php Diff File
mod - application/views/survey/questions/multiplenumeric/answer_input.php Diff File
add - application/views/survey/questions/multiplenumeric/rows/dynamic.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File
mod - application/views/survey/questions/multipleshorttext/answer.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_textarea.php Diff File
add - application/views/survey/system/display.php Diff File
add - application/views/survey/system/loadForm/error.php Diff File
add - application/views/survey/system/loadForm/form.php Diff File
add - application/views/survey/system/loadForm/heading.php Diff File
add - application/views/survey/system/loadForm/message.php Diff File
add - application/views/survey/system/saveForm/anonymized.php Diff File
add - application/views/survey/system/saveForm/error.php Diff File
add - application/views/survey/system/saveForm/form.php Diff File
add - application/views/survey/system/saveForm/heading.php Diff File
add - application/views/survey/system/saveForm/message.php Diff File
mod - styles-public/numeric-slider.css Diff File
mod - templates/base/pstpl/load.pstpl Diff File
mod - templates/base/pstpl/save.pstpl Diff File
mod - templates/base_awesome/css/template.css Diff File
mod - templates/base_awesome/pstpl/load.pstpl Diff File
mod - templates/base_awesome/pstpl/save.pstpl Diff File
mod - templates/default/css/template.css Diff File