LimeSurvey: develop 3fbd9495

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-05-16 14:39 develop be6fa415
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/internal.php
application/config/version.php
application/controllers/admin/checkintegrity.php
application/controllers/admin/database.php
application/helpers/questionHelper.php
application/views/admin/survey/Question/editQuestion_view.php
application/views/survey/questions/answer/arrays/5point/rows/answer_row.php
application/views/survey/questions/answer/equation/answer.php
application/views/survey/questions/answer/file_upload/answer.php
application/views/survey/questions/answer/file_upload/answer.twig
assets/scripts/admin/questions.js
locale/_template/limesurvey.pot
locale/nb/nb.mo
locale/pl/pl.mo
mod - .gitignore Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/export/exportresult_panels/_format.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/labels/_labelviewrightcontent_view.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
rm - application/views/survey/questions/answer/arrays/10point/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/10point/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/10point/rows/cells/answer_td_input.php Diff
add - application/views/survey/questions/answer/arrays/10point/rows/cells/answer_td_input.twig Diff File
rm - application/views/survey/questions/answer/arrays/10point/rows/cells/header_answer.php Diff
add - application/views/survey/questions/answer/arrays/10point/rows/cells/header_answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/10point/rows/cells/header_information.php Diff
add - application/views/survey/questions/answer/arrays/10point/rows/cells/header_information.twig Diff File
rm - application/views/survey/questions/answer/arrays/5point/columns/col.php Diff
add - application/views/survey/questions/answer/arrays/5point/columns/col.twig Diff File
rm - application/views/survey/questions/answer/arrays/5point/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/5point/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/5point/rows/cells/answer_td_input.php Diff
add - application/views/survey/questions/answer/arrays/5point/rows/cells/answer_td_input.twig Diff File
rm - application/views/survey/questions/answer/arrays/5point/rows/cells/header_answer.php Diff
add - application/views/survey/questions/answer/arrays/5point/rows/cells/header_answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/5point/rows/cells/header_information.php Diff
add - application/views/survey/questions/answer/arrays/5point/rows/cells/header_information.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/dropdown/answer.php Diff
add - application/views/survey/questions/answer/arrays/array/dropdown/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/dropdown/empty.php Diff
add - application/views/survey/questions/answer/arrays/array/dropdown/empty.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/dropdown/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/array/dropdown/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/no_dropdown/answer.php Diff
add - application/views/survey/questions/answer/arrays/array/no_dropdown/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/answer_td.php Diff
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/answer_td.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_answer.php Diff
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_information.php Diff
add - application/views/survey/questions/answer/arrays/array/no_dropdown/rows/cells/header_information.twig Diff File
rm - application/views/survey/questions/answer/arrays/column/answer.php Diff
add - application/views/survey/questions/answer/arrays/column/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/dualscale/answer.php Diff
add - application/views/survey/questions/answer/arrays/dualscale/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/dualscale/answer_dropdown.php Diff
add - application/views/survey/questions/answer/arrays/dualscale/answer_dropdown.twig Diff File
rm - application/views/survey/questions/answer/arrays/dualscale/answer_header.php Diff
add - application/views/survey/questions/answer/arrays/dualscale/answer_header.twig Diff File
rm - application/views/survey/questions/answer/arrays/increasesamedecrease/columns/col.php Diff
add - application/views/survey/questions/answer/arrays/increasesamedecrease/columns/col.twig Diff File
rm - application/views/survey/questions/answer/arrays/increasesamedecrease/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/increasesamedecrease/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/increasesamedecrease/rows/cells/thead.php Diff
add - application/views/survey/questions/answer/arrays/increasesamedecrease/rows/cells/thead.twig Diff File
rm - application/views/survey/questions/answer/arrays/multiflexi/answer.php Diff
add - application/views/survey/questions/answer/arrays/multiflexi/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/multiflexi/empty_error.php Diff
add - application/views/survey/questions/answer/arrays/multiflexi/empty_error.twig Diff File
rm - application/views/survey/questions/answer/arrays/multiflexi/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/multiflexi/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td.php Diff
add - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td.twig Diff File
rm - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td_checkboxes.php Diff
add - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td_checkboxes.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/answer.php Diff
add - application/views/survey/questions/answer/arrays/texts/answer.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/columns/col_total.php Diff
add - application/views/survey/questions/answer/arrays/texts/columns/col_total.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/empty_error.php Diff
add - application/views/survey/questions/answer/arrays/texts/empty_error.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/texts/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/rows/cells/answer_td.php Diff
add - application/views/survey/questions/answer/arrays/texts/rows/cells/answer_td.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/rows/cells/td_grand_total.php Diff
add - application/views/survey/questions/answer/arrays/texts/rows/cells/td_grand_total.twig Diff File
rm - application/views/survey/questions/answer/arrays/texts/rows/cells/td_total.php Diff
add - application/views/survey/questions/answer/arrays/texts/rows/cells/td_total.twig Diff File
rm - application/views/survey/questions/answer/arrays/yesnouncertain/columns/col.php Diff
add - application/views/survey/questions/answer/arrays/yesnouncertain/columns/col.twig Diff File
rm - application/views/survey/questions/answer/arrays/yesnouncertain/rows/answer_row.php Diff
add - application/views/survey/questions/answer/arrays/yesnouncertain/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/arrays/yesnouncertain/rows/cells/thead.php Diff
add - application/views/survey/questions/answer/arrays/yesnouncertain/rows/cells/thead.twig Diff File
rm - application/views/survey/questions/answer/boilerplate/answer.php Diff
add - application/views/survey/questions/answer/boilerplate/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
rm - application/views/survey/questions/answer/equation/answer.php Diff
add - application/views/survey/questions/answer/equation/answer.twig Diff File
rm - application/views/survey/questions/answer/file_upload/answer.php Diff
mod - application/views/survey/questions/answer/file_upload/answer.twig Diff File
rm - application/views/survey/questions/answer/gender/buttons/answer.php Diff
add - application/views/survey/questions/answer/gender/buttons/answer.twig Diff File
rm - application/views/survey/questions/answer/gender/radio/answer.php Diff
add - application/views/survey/questions/answer/gender/radio/answer.twig Diff File
rm - application/views/survey/questions/answer/language/answer.php Diff
add - application/views/survey/questions/answer/language/answer.twig Diff File
rm - application/views/survey/questions/answer/list_dropdown/answer.php Diff
add - application/views/survey/questions/answer/list_dropdown/answer.twig Diff File
rm - application/views/survey/questions/answer/list_dropdown/rows/othertext.php Diff
add - application/views/survey/questions/answer/list_dropdown/rows/othertext.twig Diff File
rm - application/views/survey/questions/answer/list_with_comment/list/answer.php Diff
add - application/views/survey/questions/answer/list_with_comment/list/answer.twig Diff File
rm - application/views/survey/questions/answer/list_with_comment/list/rows/answer_row.php Diff
add - application/views/survey/questions/answer/list_with_comment/list/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/listradio/answer.php Diff
add - application/views/survey/questions/answer/listradio/answer.twig Diff File
rm - application/views/survey/questions/answer/listradio/rows/answer_row.php Diff
add - application/views/survey/questions/answer/listradio/rows/answer_row.twig Diff File
rm - application/views/survey/questions/answer/listradio/rows/answer_row_noanswer.php Diff
add - application/views/survey/questions/answer/listradio/rows/answer_row_noanswer.twig Diff File
rm - application/views/survey/questions/answer/listradio/rows/answer_row_other.php Diff
add - application/views/survey/questions/answer/listradio/rows/answer_row_other.twig Diff File
rm - application/views/survey/questions/answer/longfreetext/answer.php Diff
add - application/views/survey/questions/answer/longfreetext/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
rm - application/views/survey/questions/answer/multiplechoice_with_comments/answer.php Diff
add - application/views/survey/questions/answer/multiplechoice_with_comments/answer.twig Diff File
rm - application/views/survey/questions/answer/multiplenumeric/empty.php Diff
add - application/views/survey/questions/answer/multiplenumeric/empty.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
rm - application/views/survey/questions/answer/multipleshorttext/empty.php Diff
add - application/views/survey/questions/answer/multipleshorttext/empty.twig Diff File
rm - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.php Diff
add - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.twig Diff File
rm - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_textarea.php Diff
add - application/views/survey/questions/answer/multipleshorttext/rows/answer_row_textarea.twig Diff File
rm - application/views/survey/questions/answer/numerical/answer.php Diff
add - application/views/survey/questions/answer/numerical/answer.twig Diff File
rm - application/views/survey/questions/answer/shortfreetext/text/item.php Diff
add - application/views/survey/questions/answer/shortfreetext/text/item.twig Diff File
rm - application/views/survey/questions/answer/shortfreetext/textarea/item.php Diff
add - application/views/survey/questions/answer/shortfreetext/textarea/item.twig Diff File
rm - application/views/survey/questions/answer/yesno/buttons/item.php Diff
add - application/views/survey/questions/answer/yesno/buttons/item.twig Diff File
rm - application/views/survey/questions/answer/yesno/radio/item.php Diff
add - application/views/survey/questions/answer/yesno/radio/item.twig Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
mod - assets/scripts/admin/questions.js Diff File
add - docs/limesurvey-ruleset.xml 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/de/de.mo Diff File
mod - locale/fr/fr.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/ja/ja.mo Diff File
add - locale/ml/index.html Diff File
add - locale/ml/ml.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/pt-BR/pt-BR.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - themes/question/browserdetect/survey/questions/answer/shortfreetext/text/item.twig Diff File
rm - themes/question/browserdetect/survey/questions/answer/shortfreetext/text/item_alternative.php Diff
add - themes/question/browserdetect/survey/questions/answer/shortfreetext/text/item_alternative.twig Diff File
rm - themes/question/image_select/survey/questions/answer/listradio/answer.php Diff
add - themes/question/image_select/survey/questions/answer/listradio/answer.twig Diff File
add - themes/question/image_select/survey/questions/answer/listradio/columns/column_footer.twig Diff File
rm - themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_noanswer.php Diff
add - themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_noanswer.twig Diff File
rm - themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_other.php Diff
add - themes/question/image_select/survey/questions/answer/listradio/rows/answer_row_other.twig Diff File
rm - themes/question/image_select/survey/questions/answer/multiplechoice/answer.php Diff
add - themes/question/image_select/survey/questions/answer/multiplechoice/answer.twig Diff File
rm - themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row_other.php Diff
add - themes/question/image_select/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
rm - themes/question/ranking_advanced/survey/questions/answer/ranking/answer_alt.php Diff
add - themes/question/ranking_advanced/survey/questions/answer/ranking/answer_alt.twig Diff File
mod - themes/question/ranking_advanced/survey/questions/answer/ranking/rows/answer_row.twig Diff File
rm - themes/question/ranking_advanced/survey/questions/answer/ranking/rows/answer_row_alt.php Diff
add - themes/question/ranking_advanced/survey/questions/answer/ranking/rows/answer_row_alt.twig Diff File
mod - themes/survey/bootswatch/config.xml Diff File
rm - themes/survey/bootswatch/scripts/theme.js Diff