LimeSurvey: answers_html d31615df

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html 2016-08-25 17:38:40 answers_html 5973e276
Changeset

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

Conflicts:

application/helpers/qanda_helper.php

application/views/survey/questions/arrays/5point/rows/answer_row.php

application/views/survey/questions/multipleshorttext/rows/answer_row_textarea.php
rm - README Diff File
add - README.md Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/databaseupdate.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/plugins/ExportR/RSyntaxWriter.php Diff File
add - application/core/plugins/extendedStartPage/extendedStartPage.php Diff File
add - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff File
mod - application/extensions/AdminFooter/AdminFooter.php Diff File
mod - application/extensions/AdminFooter/views/footer.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
add - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php Diff File
add - application/extensions/admin/survey/ListSurveysWidget/README.md Diff File
add - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
add - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
add - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/ExcelWriter.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/User.php Diff File
add - application/third_party/html2text/.gitignore Diff File
add - application/third_party/html2text/.travis.yml Diff File
add - application/third_party/html2text/README.md Diff File
add - application/third_party/html2text/composer.json Diff File
add - application/third_party/html2text/phpunit.xml.dist Diff File
add - application/third_party/html2text/src/Html2Text.php Diff File
mod - application/third_party/tcpdf/CHANGELOG.TXT Diff File
rm - application/third_party/tcpdf/README.TXT Diff File
add - application/third_party/tcpdf/README.md Diff File
mod - application/third_party/tcpdf/composer.json Diff File
mod - application/third_party/tcpdf/config/tcpdf_config.php Diff File
mod - application/third_party/tcpdf/fonts/ae_fonts_2.0/ChangeLog Diff File
add - application/third_party/tcpdf/fonts/ae_fonts_2.0/ChangeLog.9745.BAK Diff File
mod - application/third_party/tcpdf/fonts/aealarabiya.php Diff File
mod - application/third_party/tcpdf/fonts/aefurat.php Diff File
mod - application/third_party/tcpdf/fonts/cid0cs.php Diff File
mod - application/third_party/tcpdf/fonts/cid0ct.php Diff File
mod - application/third_party/tcpdf/fonts/cid0jp.php Diff File
mod - application/third_party/tcpdf/fonts/cid0kr.php Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/README Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt Diff File
add - application/third_party/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt Diff File
mod - application/third_party/tcpdf/fonts/dejavusans.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensed.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusanscondensedi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansextralight.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmono.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonob.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonobi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavusansmonoi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserif.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensed.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedb.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedbi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifcondensedi.php Diff File
mod - application/third_party/tcpdf/fonts/dejavuserifi.php Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/AUTHORS Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/COPYING Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/CREDITS Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/ChangeLog Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/INSTALL Diff File
add - application/third_party/tcpdf/fonts/freefont-20100919/README Diff File
mod - application/third_party/tcpdf/fonts/freefont-20120503/ChangeLog Diff File
add - application/third_party/tcpdf/fonts/freefont-20120503/ChangeLog.10070.BAK Diff File
mod - application/third_party/tcpdf/fonts/freemono.php Diff File
mod - application/third_party/tcpdf/fonts/freemonob.php Diff File
mod - application/third_party/tcpdf/fonts/freemonobi.php Diff File
mod - application/third_party/tcpdf/fonts/freemonoi.php Diff File
mod - application/third_party/tcpdf/fonts/freesans.php Diff File
mod - application/third_party/tcpdf/fonts/freesansb.php Diff File
mod - application/third_party/tcpdf/fonts/freesansbi.php Diff File
mod - application/third_party/tcpdf/fonts/freesansi.php Diff File
mod - application/third_party/tcpdf/fonts/freeserif.php Diff File
mod - application/third_party/tcpdf/fonts/freeserifb.php Diff File
mod - application/third_party/tcpdf/fonts/freeserifbi.php Diff File
mod - application/third_party/tcpdf/fonts/freeserifi.php Diff File
mod - application/third_party/tcpdf/include/barcodes/datamatrix.php Diff File
mod - application/third_party/tcpdf/include/barcodes/pdf417.php Diff File
mod - application/third_party/tcpdf/include/barcodes/qrcode.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_filters.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_fonts.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_images.php Diff File
mod - application/third_party/tcpdf/include/tcpdf_static.php Diff File
mod - application/third_party/tcpdf/tcpdf.php Diff File
mod - application/third_party/tcpdf/tcpdf_autoconfig.php Diff File
mod - application/third_party/tcpdf/tcpdf_barcodes_1d.php Diff File
mod - application/third_party/tcpdf/tcpdf_parser.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
add - application/views/admin/databaseupdate/db.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_answer.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/export/statistics_user_view.php Diff File
mod - application/views/admin/homepagesettings/admin.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/importQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_accordion_container.php Diff File
add - application/views/admin/survey/subview/tabPluginSettings_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/modifyuser.php Diff File
mod - application/views/admin/user/personalsettings.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/register/registerForm.php Diff File
mod - application/views/survey/frontpage/enterCaptcha.php Diff File
mod - application/views/survey/frontpage/enterToken.php Diff File
mod - application/views/survey/questions/arrays/texts/rows/cells/answer_td.php Diff File
mod - application/views/survey/system/LanguageChanger/LanguageChanger.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
mod - docs/release_notes.txt 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
mod - locale/_template/limesurvey.pot Diff File
mod - locale/af/af.mo 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/el/el.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/id/id.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/ky/ky.mo Diff File
mod - locale/lv/lv.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/pt-BR/pt-BR.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/homepagesettings.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/users.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - templates/default/css/flat_and_modern-rtl.css Diff File
mod - templates/default/css/flat_and_modern.css Diff File
mod - templates/default/css/template-rtl.css Diff File
mod - templates/default/css/template.css Diff File
add - templates/default/fonts/lato-v11-latin-700.eot Diff File
add - templates/default/fonts/lato-v11-latin-700.svg Diff File
add - templates/default/fonts/lato-v11-latin-700.ttf Diff File
add - templates/default/fonts/lato-v11-latin-700.woff Diff File
add - templates/default/fonts/lato-v11-latin-700.woff2 Diff File
add - templates/default/fonts/lato-v11-latin-italic.eot Diff File
add - templates/default/fonts/lato-v11-latin-italic.svg Diff File
add - templates/default/fonts/lato-v11-latin-italic.ttf Diff File
add - templates/default/fonts/lato-v11-latin-italic.woff Diff File
add - templates/default/fonts/lato-v11-latin-italic.woff2 Diff File
add - templates/default/fonts/lato-v11-latin-regular.eot Diff File
add - templates/default/fonts/lato-v11-latin-regular.svg Diff File
add - templates/default/fonts/lato-v11-latin-regular.ttf Diff File
add - templates/default/fonts/lato-v11-latin-regular.woff Diff File
add - templates/default/fonts/lato-v11-latin-regular.woff2 Diff File
mod - templates/news_paper/css/news_paper-rtl.css Diff File
mod - templates/news_paper/css/news_paper.css Diff File
mod - templates/news_paper/css/template-rtl.css Diff File
mod - templates/news_paper/css/template.css Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-700.eot Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-700.svg Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-700.ttf Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-700.woff Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-700.woff2 Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-regular.eot Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-regular.svg Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-regular.ttf Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-regular.woff Diff File
add - templates/news_paper/fonts/news-cycle-v13-latin-regular.woff2 Diff File
mod - templates/ubuntu_orange/css/template-rtl.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange-rtl.css Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.eot Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.svg Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.ttf Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.woff Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-700.woff2 Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.eot Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.svg Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.ttf Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.woff Diff File
add - templates/ubuntu_orange/fonts/ubuntu-v9-latin-regular.woff2 Diff File