LimeSurvey: answers_html dc651e95

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-09-15 16:04:30 answers_html d57fce21
Changeset

Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey.git into answers_html

Conflicts:

application/helpers/qanda_helper.php

application/views/survey/questions/arrays/array/dropdown/answer.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSDbCriteria.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/common_helper.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/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/survey/questions/arrays/array/dropdown/answer.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
rm - templates/news_paper/config.xml Diff File
rm - templates/news_paper/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css Diff File
rm - templates/news_paper/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css Diff File
rm - templates/news_paper/css/awesome-bootstrap-checkbox/bootswatch-reset-rtl.css Diff File
rm - templates/news_paper/css/awesome-bootstrap-checkbox/bootswatch-reset.css Diff File
rm - templates/news_paper/css/bootstrap-slider-rtl.css Diff File
rm - templates/news_paper/css/bootstrap-slider.css Diff File
rm - templates/news_paper/css/jquery-ui-custom-rtl.css Diff File
rm - templates/news_paper/css/jquery-ui-custom.css Diff File
rm - templates/news_paper/css/news_paper-rtl.css Diff File
rm - templates/news_paper/css/news_paper.css Diff File
rm - templates/news_paper/css/print_template-rtl.css Diff File
rm - templates/news_paper/css/print_template.css Diff File
rm - templates/news_paper/css/template-news-paper.css Diff File
rm - templates/news_paper/css/template-rtl.css Diff File
rm - templates/news_paper/css/template.css Diff File
rm - templates/news_paper/favicon.ico Diff File
rm - templates/news_paper/files/logo.png Diff File
rm - templates/news_paper/files/print_img_checkbox.png Diff File
rm - templates/news_paper/files/print_img_radio.png Diff File
rm - templates/news_paper/fonts/glyphicons-halflings-regular.eot Diff File
rm - templates/news_paper/fonts/glyphicons-halflings-regular.svg Diff File
rm - templates/news_paper/fonts/glyphicons-halflings-regular.ttf Diff File
rm - templates/news_paper/fonts/glyphicons-halflings-regular.woff Diff File
rm - templates/news_paper/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-700.eot Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-700.svg Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-700.ttf Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-700.woff Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-700.woff2 Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-regular.eot Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-regular.svg Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-regular.ttf Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-regular.woff Diff File
rm - templates/news_paper/fonts/news-cycle-v13-latin-regular.woff2 Diff File
rm - templates/news_paper/logo_pdf.png Diff File
rm - templates/news_paper/news_paper.png Diff File
rm - templates/news_paper/poweredby.png Diff File
rm - templates/news_paper/preview.png Diff File
rm - templates/news_paper/scripts/bootstrap-slider.js Diff File
rm - templates/news_paper/scripts/template.js Diff File
rm - templates/news_paper/views/assessment.pstpl Diff File
rm - templates/news_paper/views/clearall.pstpl Diff File
rm - templates/news_paper/views/completed.pstpl Diff File
rm - templates/news_paper/views/endgroup.pstpl Diff File
rm - templates/news_paper/views/endpage.pstpl Diff File
rm - templates/news_paper/views/groupdescription.pstpl Diff File
rm - templates/news_paper/views/load.pstpl Diff File
rm - templates/news_paper/views/navigator.pstpl Diff File
rm - templates/news_paper/views/print_group.pstpl Diff File
rm - templates/news_paper/views/print_question.pstpl Diff File
rm - templates/news_paper/views/print_survey.pstpl Diff File
rm - templates/news_paper/views/printanswers.pstpl Diff File
rm - templates/news_paper/views/privacy.pstpl Diff File
rm - templates/news_paper/views/question.pstpl Diff File
rm - templates/news_paper/views/register.pstpl Diff File
rm - templates/news_paper/views/save.pstpl Diff File
rm - templates/news_paper/views/startgroup.pstpl Diff File
rm - templates/news_paper/views/startpage.pstpl Diff File
rm - templates/news_paper/views/survey.pstpl Diff File
rm - templates/news_paper/views/surveylist.pstpl Diff File
rm - templates/news_paper/views/welcome.pstpl Diff File
rm - templates/ubuntu_orange/config.xml Diff File
rm - templates/ubuntu_orange/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css Diff File
rm - templates/ubuntu_orange/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css Diff File
rm - templates/ubuntu_orange/css/awesome-bootstrap-checkbox/bootswatch-reset-rtl.css Diff File
rm - templates/ubuntu_orange/css/awesome-bootstrap-checkbox/bootswatch-reset.css Diff File
rm - templates/ubuntu_orange/css/bootstrap-slider-rtl.css Diff File
rm - templates/ubuntu_orange/css/bootstrap-slider.css Diff File
rm - templates/ubuntu_orange/css/jquery-ui-custom-rtl.css Diff File
rm - templates/ubuntu_orange/css/jquery-ui-custom.css Diff File
rm - templates/ubuntu_orange/css/print_template-rtl.css Diff File
rm - templates/ubuntu_orange/css/print_template.css Diff File
rm - templates/ubuntu_orange/css/template-rtl.css Diff File
rm - templates/ubuntu_orange/css/template-ubuntu-orange.css Diff File
rm - templates/ubuntu_orange/css/template.css Diff File
rm - templates/ubuntu_orange/css/ubuntu_orange-rtl.css Diff File
rm - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
rm - templates/ubuntu_orange/favicon.ico Diff File
rm - templates/ubuntu_orange/files/logo.png Diff File
rm - templates/ubuntu_orange/files/print_img_checkbox.png Diff File
rm - templates/ubuntu_orange/files/print_img_radio.png Diff File
rm - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.eot Diff File
rm - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.svg Diff File
rm - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.ttf Diff File
rm - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.woff Diff File
rm - templates/ubuntu_orange/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.eot Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.svg Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.ttf Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.woff Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.woff2 Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.eot Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.svg Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.ttf Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.woff Diff File
rm - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.woff2 Diff File
rm - templates/ubuntu_orange/logo_pdf.png Diff File
rm - templates/ubuntu_orange/poweredby.png Diff File
rm - templates/ubuntu_orange/preview.png Diff File
rm - templates/ubuntu_orange/scripts/bootstrap-slider.js Diff File
rm - templates/ubuntu_orange/scripts/template.js Diff File
rm - templates/ubuntu_orange/ubuntu_orange.png Diff File
rm - templates/ubuntu_orange/views/assessment.pstpl Diff File
rm - templates/ubuntu_orange/views/clearall.pstpl Diff File
rm - templates/ubuntu_orange/views/completed.pstpl Diff File
rm - templates/ubuntu_orange/views/endgroup.pstpl Diff File
rm - templates/ubuntu_orange/views/endpage.pstpl Diff File
rm - templates/ubuntu_orange/views/groupdescription.pstpl Diff File
rm - templates/ubuntu_orange/views/load.pstpl Diff File
rm - templates/ubuntu_orange/views/navigator.pstpl Diff File
rm - templates/ubuntu_orange/views/print_group.pstpl Diff File
rm - templates/ubuntu_orange/views/print_question.pstpl Diff File
rm - templates/ubuntu_orange/views/print_survey.pstpl Diff File
rm - templates/ubuntu_orange/views/printanswers.pstpl Diff File
rm - templates/ubuntu_orange/views/privacy.pstpl Diff File
rm - templates/ubuntu_orange/views/question.pstpl Diff File
rm - templates/ubuntu_orange/views/register.pstpl Diff File
rm - templates/ubuntu_orange/views/save.pstpl Diff File
rm - templates/ubuntu_orange/views/startgroup.pstpl Diff File
rm - templates/ubuntu_orange/views/startpage.pstpl Diff File
rm - templates/ubuntu_orange/views/survey.pstpl Diff File
rm - templates/ubuntu_orange/views/surveylist.pstpl Diff File
rm - templates/ubuntu_orange/views/welcome.pstpl Diff File