LimeSurvey: answers_html-mergedMaster 958fce8c

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu answers_html-mergedMaster 2016-10-11 12:17:43 answers_html de87e16f
Changeset

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

Conflicts:

application/config/version.php

application/helpers/expressions/em_manager_helper.php

application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php

styles-public/ranking.css

templates/default/css/template.css

templates/default/scripts/template.js

templates/news_paper/scripts/template.js

templates/news_paper/views/startpage.pstpl

templates/ubuntu_orange/css/template.css

templates/ubuntu_orange/css/ubuntu_orange.css
add - .bowerrc Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/databaseupdate.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.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/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/extensions/PannelBoxWidget/PannelBoxWidget.php Diff File
mod - application/extensions/PannelBoxWidget/views/box.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.css Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
add - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/selector.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
mod - application/extensions/bootstrap/assets/css/bootstrap.css Diff File
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
add - application/helpers/admin/ajax_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/template_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/frontend_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/helpers/update/update_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttribute.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/third_party/phpmailer/.gitignore Diff File
mod - application/third_party/phpmailer/README.md Diff File
mod - application/third_party/phpmailer/VERSION Diff File
mod - application/third_party/phpmailer/changelog.md Diff File
mod - application/third_party/phpmailer/class.phpmailer.php Diff File
mod - application/third_party/phpmailer/class.phpmaileroauthgoogle.php Diff File
mod - application/third_party/phpmailer/class.pop3.php Diff File
mod - application/third_party/phpmailer/class.smtp.php Diff File
mod - application/third_party/phpmailer/composer.json Diff File
mod - application/third_party/phpmailer/composer.lock Diff File
mod - application/third_party/phpmailer/get_oauth_token.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-pl.php Diff File
mod - application/third_party/phpmailer/language/phpmailer.lang-ru.php Diff File
mod - application/third_party/xlsx_writer/xlsxwriter.class.php Diff File
add - application/views/admin/authentication/ajaxLogin.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
add - application/views/admin/databaseupdate/verify.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
add - application/views/admin/participants/massive_actions/_selector.php Diff File
add - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
add - application/views/admin/participants/massive_actions/_selector_share.php Diff File
add - application/views/admin/participants/modal_subviews/_addToSurvey.php Diff File
add - application/views/admin/participants/modal_subviews/_deleteParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_editAttribute.php Diff File
add - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_exportCSV.php Diff File
add - application/views/admin/participants/modal_subviews/_shareParticipant.php Diff File
add - application/views/admin/participants/modal_subviews/_showParticipantSurveys.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/date.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/dropdown.php Diff File
add - application/views/admin/participants/modal_subviews/attributes/textbox.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
rm - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/pluginmanager/configure.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/responses/massive_actions/_selector.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/admin_notifications.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/super/welcome.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabCreate_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/installer/optconfig_view.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - framework/zii/widgets/assets/gridview/jquery.yiigridview.js Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/bn/bn.mo Diff File
add - locale/bn/index.html Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fi/fi.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/ky/ky.mo Diff File
mod - locale/nb/nb.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/sk/sk.mo Diff File
mod - locale/sq/sq.mo Diff File
mod - locale/sv/sv.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/attributeMap.js Diff File
mod - scripts/admin/homepagesettings.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/admin/participantpanel.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles-public/browse.css Diff File
mod - styles/Apple_Blossom/css/lime-admin-colors.css 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/Apple_Blossom/scripts/panelclickable.js Diff File
mod - styles/Bay_of_Many/config.xml Diff File
mod - styles/Bay_of_Many/css/lime-admin-colors.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/Bay_of_Many/scripts/panelclickable.js Diff File
mod - styles/Black_Pearl/css/lime-admin-colors.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/Black_Pearl/scripts/panelclickable.js Diff File
mod - styles/Dark_Sky/css/lime-admin-colors.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/Dark_Sky/scripts/panelclickable.js Diff File
mod - styles/Free_Magenta/css/lime-admin-colors.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/Free_Magenta/scripts/panelclickable.js Diff File
mod - styles/Noto_All_Languages/css/lime-admin-colors.css Diff File
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css Diff File
rm - templates/default_251/config.xml Diff File
rm - templates/default_251/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox-rtl.css Diff File
rm - templates/default_251/css/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css Diff File
rm - templates/default_251/css/bootstrap-slider-rtl.css Diff File
rm - templates/default_251/css/bootstrap-slider.css Diff File
rm - templates/default_251/css/flat_and_modern-rtl.css Diff File
rm - templates/default_251/css/flat_and_modern.css Diff File
rm - templates/default_251/css/jquery-ui-custom-rtl.css Diff File
rm - templates/default_251/css/jquery-ui-custom.css Diff File
rm - templates/default_251/css/print_template-rtl.css Diff File
rm - templates/default_251/css/print_template.css Diff File
rm - templates/default_251/css/template-rtl.css Diff File
rm - templates/default_251/css/template.css Diff File
rm - templates/default_251/default.png Diff File
rm - templates/default_251/favicon.ico Diff File
rm - templates/default_251/files/logo.png Diff File
rm - templates/default_251/files/print_img_checkbox.png Diff File
rm - templates/default_251/files/print_img_radio.png Diff File
rm - templates/default_251/fonts/glyphicons-halflings-regular.eot Diff File
rm - templates/default_251/fonts/glyphicons-halflings-regular.svg Diff File
rm - templates/default_251/fonts/glyphicons-halflings-regular.ttf Diff File
rm - templates/default_251/fonts/glyphicons-halflings-regular.woff Diff File
rm - templates/default_251/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - templates/default_251/fonts/lato-v11-latin-700.eot Diff File
rm - templates/default_251/fonts/lato-v11-latin-700.svg Diff File
rm - templates/default_251/fonts/lato-v11-latin-700.ttf Diff File
rm - templates/default_251/fonts/lato-v11-latin-700.woff Diff File
rm - templates/default_251/fonts/lato-v11-latin-700.woff2 Diff File
rm - templates/default_251/fonts/lato-v11-latin-italic.eot Diff File
rm - templates/default_251/fonts/lato-v11-latin-italic.svg Diff File
rm - templates/default_251/fonts/lato-v11-latin-italic.ttf Diff File
rm - templates/default_251/fonts/lato-v11-latin-italic.woff Diff File
rm - templates/default_251/fonts/lato-v11-latin-italic.woff2 Diff File
rm - templates/default_251/fonts/lato-v11-latin-regular.eot Diff File
rm - templates/default_251/fonts/lato-v11-latin-regular.svg Diff File
rm - templates/default_251/fonts/lato-v11-latin-regular.ttf Diff File
rm - templates/default_251/fonts/lato-v11-latin-regular.woff Diff File
rm - templates/default_251/fonts/lato-v11-latin-regular.woff2 Diff File
rm - templates/default_251/logo_pdf.png Diff File
rm - templates/default_251/poweredby.png Diff File
rm - templates/default_251/preview.png Diff File
rm - templates/default_251/scripts/bootstrap-slider.js Diff File
rm - templates/default_251/scripts/template.js Diff File
rm - templates/default_251/views/assessment.pstpl Diff File
rm - templates/default_251/views/clearall.pstpl Diff File
rm - templates/default_251/views/completed.pstpl Diff File
rm - templates/default_251/views/endgroup.pstpl Diff File
rm - templates/default_251/views/endpage.pstpl Diff File
rm - templates/default_251/views/groupdescription.pstpl Diff File
rm - templates/default_251/views/load.pstpl Diff File
rm - templates/default_251/views/navigator.pstpl Diff File
rm - templates/default_251/views/print_group.pstpl Diff File
rm - templates/default_251/views/print_question.pstpl Diff File
rm - templates/default_251/views/print_survey.pstpl Diff File
rm - templates/default_251/views/printanswers.pstpl Diff File
rm - templates/default_251/views/privacy.pstpl Diff File
rm - templates/default_251/views/question.pstpl Diff File
rm - templates/default_251/views/register.pstpl Diff File
rm - templates/default_251/views/save.pstpl Diff File
rm - templates/default_251/views/startgroup.pstpl Diff File
rm - templates/default_251/views/startpage.pstpl Diff File
rm - templates/default_251/views/survey.pstpl Diff File
rm - templates/default_251/views/surveylist.pstpl Diff File
rm - templates/default_251/views/welcome.pstpl Diff File
add - third_party/bootstrap-datetimepicker/.bower.json Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker-standalone.css Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css Diff File
add - third_party/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css Diff File
add - third_party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js Diff File
add - third_party/bootstrap-switch/.bowerrc Diff File
add - third_party/bootstrap-switch/.gitignore Diff File
add - third_party/bootstrap-switch/css/bootstrap-switch.css Diff File
add - third_party/bootstrap-switch/css/bootstrap-switch.min.css Diff File
add - third_party/bootstrap-switch/js/bootstrap-switch.js Diff File
add - third_party/bootstrap-switch/js/bootstrap-switch.min.js Diff File