LimeSurvey: master_13928 bbdcf561

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master_13928 2018-10-15 20:19 master_13928 74982bba
Changeset

Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into master_13928

Conflicts:

application/config/version.php
mod - .gitignore Diff File
mod - .htaccess Diff File
mod - .travis.yml Diff File
mod - README.md Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/SurveysGroupsController.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.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/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/controllers/admin/themes.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
add - application/core/web/LSYii_SecurityManager.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_expiry_dialog.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/searchBox.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/export/CsvWriter.php Diff File
mod - application/helpers/admin/export/FormattingOptions.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/exportresults_helper.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_core_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/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/Notification.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Session.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SettingsUser.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/SurveyLanguageSetting.php Diff File
mod - application/models/SurveyLink.php Diff File
mod - application/models/SurveyTimingDynamic.php Diff File
mod - application/models/Surveymenu.php Diff File
mod - application/models/SurveymenuEntries.php Diff File
mod - application/models/SurveymenuEntryData.php Diff File
mod - application/models/SurveysGroups.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/Timing.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/Tutorial.php Diff File
mod - application/models/UniqueNotification.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/UserInGroup.php Diff File
mod - application/models/behaviors/PluginEventBehavior.php Diff File
mod - application/models/index.html Diff File
mod - application/third_party/pclzip/pclzip.lib.php Diff File
mod - application/third_party/pear/OLE/OLE.php Diff File
mod - application/third_party/pear/OLE/PPS.php Diff File
mod - application/third_party/pear/OLE/PPS/File.php Diff File
mod - application/third_party/pear/OLE/PPS/Root.php Diff File
add - application/third_party/pear/OLE/PPS/System.php Diff File
mod - application/third_party/pear/PEAR.php Diff File
add - application/third_party/pear/Spreadsheet/Excel/Writer.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Format.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Validator.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
mod - application/third_party/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
rm - application/third_party/pear/Spreadsheet/Excel/Xlswriter.php Diff
mod - application/views/admin/assessments/assessments_edit.php Diff File
mod - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
mod - application/views/admin/emailtemplates/email_language_tab.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/export/exportresult_panels/_format.php Diff File
mod - application/views/admin/export/exportresult_panels/_headings.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/participants/massive_actions/_selector.php Diff File
add - application/views/admin/participants/massive_actions/_update.php Diff File
add - application/views/admin/participants/massive_actions/_update_results.php Diff File
mod - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/date.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/dropdown.php Diff File
mod - application/views/admin/participants/modal_subviews/attributes/textbox.php Diff File
mod - application/views/admin/quotas/viewquotas_quota_members.php Diff File
mod - application/views/admin/responses/browsemenubar_view.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/sidemenu.php Diff File
mod - application/views/admin/super/welcome.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
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_questions_mandatory.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_subquestansw_order.php Diff File
mod - application/views/admin/survey/Question/question_subviews/_accordion_container.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/breadcrumb.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/survey/subview/_create_survey_text.php Diff File
mod - application/views/admin/surveymenu_entries/_form.php Diff File
mod - application/views/admin/surveysgroups/update.php Diff File
mod - application/views/admin/themeoptions/index.php Diff File
mod - application/views/admin/themeoptions/surveythemelist.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/massive_actions/_selector.php Diff File
mod - application/views/admin/token/massive_actions/_update.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/usergroup/mailUserGroup_view.php Diff File
mod - application/views/installer/dbconfig_view.php Diff File
mod - application/views/survey/questions/answer/arrays/multiflexi/rows/cells/answer_td.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
mod - application/views/survey/questions/answer/date/selector/answer.twig Diff File
mod - application/views/survey/questions/answer/multiplenumeric/rows/sliders/answer_row.twig Diff File
mod - application/views/survey/questions/question_help/em-tip.php Diff File
mod - assets/fonts/roboto.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
mod - assets/packages/adminbasics/css/lime-admin-common.css Diff File
mod - assets/packages/adminbasics/package.json Diff File
mod - assets/packages/adminbasics/src/components/panelsanimation.js Diff File
mod - assets/packages/adminbasics/src/pages/quickaction.js Diff File
mod - assets/packages/adminbasics/webpack.config.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.css Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.debug.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.css Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/scss/custom.scss Diff File
mod - assets/packages/adminpanel/src/components/sidebar.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_questionsgroups.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_submenu.vue Diff File
mod - assets/packages/adminpanel/webpack.config.js Diff File
add - assets/packages/decimalcustom/decimalcustom.js Diff File
mod - assets/packages/pjax/min/pjax.combined.min.js Diff File
mod - assets/packages/pjax/min/pjax.min.js Diff File
mod - assets/packages/pjax/pjax.js Diff File
mod - assets/packages/surveymenufunctions/package.json Diff File
add - assets/packages/surveymenufunctions/surveymenuentryfunctions.js Diff File
add - assets/packages/surveymenufunctions/surveymenuentryfunctions.min.js Diff File
mod - assets/packages/surveymenufunctions/surveymenufunctionswrapper.min.js Diff File
mod - assets/scripts/admin/answers.js Diff File
mod - assets/scripts/admin/conditions.js Diff File
mod - assets/scripts/admin/participantpanel.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - assets/scripts/admin/statistics.js Diff File
mod - assets/scripts/admin/subquestions.js Diff File
mod - assets/scripts/admin/tokens.js Diff File
add - docs/contributions/browserstack-logo.png Diff File
add - docs/contributions/scrutinizer-logo.png Diff File
add - docs/contributions/travisci-logo.png Diff File
mod - docs/release_notes.txt Diff File
mod - framework/web/CUrlManager.php Diff File
mod - installer/create-database.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/ar.mo Diff File
mod - locale/ca/ca.mo Diff File
add - locale/cnr/cnr.mo Diff File
add - locale/cnr/index.html Diff File
mod - locale/cs-informal/cs-informal.mo Diff File
mod - locale/cs/cs.mo Diff File
mod - locale/da/da.mo Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/es-MX/es-MX.mo Diff File
mod - locale/es/es.mo Diff File
mod - locale/fa/fa.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/gl/gl.mo Diff File
mod - locale/hr/hr.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
mod - locale/ms/ms.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 - locale/ru/ru.mo Diff File
mod - locale/th/th.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - locale/vi/vi.mo Diff File
mod - locale/zh-Hans/zh-Hans.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File
mod - tests/controllers/CreateSurveyTest.php Diff File
mod - tests/controllers/ThemeControllerTest.php Diff File
mod - tests/questions/DateTimeDefaultAnswerExpressionTest.php Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/listradio/rows/answer_row.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/answer.twig Diff File
add - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.css Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/assets/scripts/bootstrapbuttons.js Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/config.xml Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row.twig Diff File
mod - themes/question/bootstrap_buttons/survey/questions/answer/multiplechoice/rows/answer_row_other.twig Diff File
mod - themes/question/browserdetect/survey/questions/answer/shortfreetext/text/item.twig Diff File
mod - themes/survey/bootswatch/config.xml Diff File
rm - themes/survey/bootswatch/css/ajaxify.css Diff
mod - themes/survey/fruity/config.xml Diff File
add - themes/survey/fruity/files/favicon.ico Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/layout_printanswers.twig Diff File
mod - themes/survey/vanilla/views/subviews/content/userforms.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/clearall_buttons.twig Diff File
mod - themes/survey/vanilla/views/subviews/navigation/save_buttons.twig Diff File
mod - third_party/composer/ClassLoader.php Diff File
mod - third_party/composer/LICENSE Diff File
mod - third_party/composer/autoload_classmap.php Diff File
mod - third_party/composer/autoload_namespaces.php Diff File
mod - third_party/composer/autoload_psr4.php Diff File
mod - third_party/composer/autoload_real.php Diff File
mod - third_party/composer/autoload_static.php Diff File
mod - third_party/kcfinder/core/bootstrap.php Diff File
add - upload/surveys/.htaccess Diff File
add - upload/themes/survey/index.html Diff File