LimeSurvey: master_13513 a1d0c695

Diff Back to Repository
Author Committer Branch Timestamp Parent
user70560 GitHub master_13513 2018-06-18 23:43:53 master_13513 0c94b633
Changeset

Merge branch 'develop' into master_13513
mod - .travis.yml Diff File
mod - README.md Diff File
mod - application/commands/CompileAssetsCommand.php Diff File
mod - application/commands/DemomodeCommand.php Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/WipeCommand.php 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/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveyController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.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/limereplacementfields.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/quotas.php Diff File
mod - application/controllers/admin/remotecontrol.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/translate.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/ConsoleApplication.php Diff File
mod - application/core/LSCaptcha.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.php Diff File
add - application/core/LSYii_ImageValidator.php Diff File
mod - application/core/LS_Twig_Extension.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
add - application/core/StaticModel.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
add - application/core/plugins/AuthLDAP/config.xml Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
add - application/core/plugins/Authdb/config.xml Diff File
mod - application/core/plugins/Authwebserver/Authwebserver.php Diff File
add - application/core/plugins/Authwebserver/config.xml Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
add - application/core/plugins/ExportR/config.xml Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
add - application/core/plugins/ExportSTATAxml/config.xml Diff File
add - application/core/plugins/extendedStartPage/config.xml Diff File
mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff File
add - application/core/plugins/oldUrlCompat/config.xml Diff File
mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/admin/TextDisplaySwitch/TextDisplaySwitch.php Diff File
mod - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/CsvWriter.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/SurveyObj.php Diff File
mod - application/helpers/admin/export/Writer.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/label_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/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_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/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/userstatistics_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginEvent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
add - application/libraries/PluginManager/PluginManagerShutdownFunction.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Answer.php Diff File
add - application/models/AnswerL10n.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/AssetVersion.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/ExpressionError.php Diff File
add - application/models/Field.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Label.php Diff File
add - application/models/LabelL10n.php Diff File
mod - application/models/LabelSet.php Diff File
mod - application/models/MapTutorialUsers.php Diff File
mod - application/models/Notification.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Plugin.php Diff File
add - application/models/PluginConfiguration.php Diff File
mod - application/models/PluginDynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionGroup.php Diff File
add - application/models/QuestionGroupL10n.php Diff File
add - application/models/QuestionL10n.php Diff File
mod - application/models/QuestionTemplate.php Diff File
add - application/models/QuestionType.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/QuotaLanguageSetting.php Diff File
mod - application/models/QuotaMember.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/SavedControl.php Diff File
mod - application/models/Survey.php Diff File
add - application/models/SurveyActivator.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/SurveyURLParameter.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/Template.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/Tutorial.php Diff File
mod - application/models/TutorialEntryRelation.php Diff File
mod - application/models/UniqueNotification.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/views/admin/assessments/assessments_view.php Diff File
mod - application/views/admin/conditions/includes/form_editconditions_header.php Diff File
mod - application/views/admin/conditions/includes/quickAddConditionForm.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/expressions/test/conditions2relevance.php Diff File
mod - application/views/admin/expressions/test/navigation_test.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/homepagesettings/_form.php Diff File
mod - application/views/admin/labels/_labelviewtabcontent_view.php Diff File
mod - application/views/admin/labels/labelsets_view.php Diff File
mod - application/views/admin/pluginmanager/configure.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
add - application/views/admin/pluginmanager/overview.php Diff File
add - application/views/admin/pluginmanager/scanFilesResult.php Diff File
add - application/views/admin/pluginmanager/uploadModal.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/_tutorial_menu.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/Question/answerOptionsEdit_view.twig Diff File
mod - application/views/admin/survey/Question/answerOptions_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/importQuestion_view.php Diff File
mod - application/views/admin/survey/Question/import_view.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_selector.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_css_class.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_question_group_position.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_questions_other.php Diff File
mod - application/views/admin/survey/Question/massive_actions/_set_statistics_options.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_subviews/_tabs.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.php Diff File
mod - application/views/admin/survey/activateSurvey_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/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_plugin_panel.php Diff File
mod - application/views/admin/survey/subview/accordion/_plugins_panel.php Diff File
rm - application/views/admin/survey/subview/addPanelIntegrationParameter_view.php Diff File
add - application/views/admin/survey/subview/surveydashboard/001-sharingpanel.twig Diff File
add - application/views/admin/survey/subview/surveydashboard/002-surveytextpanel.twig Diff File
add - application/views/admin/survey/subview/surveydashboard/003-publicationpanel.twig Diff File
add - application/views/admin/survey/subview/surveydashboard/004-generalsettingspanel.twig Diff File
add - application/views/admin/survey/subview/surveydashboard/005-hintsandwarnings.twig Diff File
add - application/views/admin/survey/subview/surveydashboard/006dbanalytics.twig Diff File
mod - application/views/admin/survey/surveySummary_view.php Diff File
mod - application/views/admin/themeoptions/update.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/usergroup/viewUserGroup_view.php Diff File
mod - application/views/survey/questions/answer/arrays/dualscale/answer.twig Diff File
mod - application/views/survey/questions/answer/equation/answer.twig Diff File
mod - application/views/survey/questions/answer/file_upload/answer.twig Diff File
add - application/views/survey/questions/answer/file_upload/modal-container.php Diff File
mod - application/views/survey/questions/answer/shortfreetext/location_mapservice/item.twig 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.js 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/store/vuex-store.js Diff File
add - assets/packages/lshelp/build/lshelper.js Diff File
add - assets/packages/lshelp/build/lshelper.min.js Diff File
add - assets/packages/lshelp/src/LimeHelper.js Diff File
mod - assets/packages/questions/numeric-slider/scripts/numeric-slider.js Diff File
add - assets/packages/questions/upload/.eslint.json Diff File
add - assets/packages/questions/upload/.eslintignore Diff File
add - assets/packages/questions/upload/.eslintrc.json Diff File
add - assets/packages/questions/upload/gulpfile.js Diff File
add - assets/packages/questions/upload/package.json Diff File
add - assets/packages/questions/upload/src/uploader.js Diff File
add - assets/packages/questions/upload/yarn-error.log Diff File
add - assets/packages/questions/upload/yarn.lock Diff File
add - assets/packages/surveysummary/qrcode.js Diff File
add - assets/packages/surveysummary/qrcode.min.js Diff File
add - assets/packages/surveysummary/surveysummary.css Diff File
add - assets/packages/surveysummary/surveysummary.js Diff File
mod - assets/scripts/admin/answers.js Diff File
add - assets/scripts/admin/plugin_manager.js Diff File
mod - assets/scripts/admin/questions.js Diff File
rm - assets/scripts/uploader.js Diff File
mod - composer.json Diff File
mod - docs/release_notes.txt Diff File
mod - framework/db/ar/CActiveRecord.php Diff File
mod - installer/create-database.php 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/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/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/ru/ru.mo Diff File
mod - locale/zh-Hant-HK/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/zh-Hant-TW.mo Diff File
add - plugins/AuditLog/config.xml Diff File
add - psalm.xml Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/TestHelper.php Diff File
mod - tests/controllers/AdminViewsTest.php Diff File
mod - tests/controllers/CreateSurveyTest.php Diff File
mod - tests/controllers/SaveDualScaleAnswerOptionsTest.php Diff File
add - tests/controllers/SurveyActivatorTest.php Diff File
add - tests/data/surveys/limesurvey_survey_496242.lss Diff File
add - tests/data/surveys/limesurvey_survey_561859.lss Diff File
mod - tests/data/travis/travis_setup.sh Diff File
mod - tests/data/views/adminSurveyViews.php Diff File
mod - tests/helpers/ExpressionCoreAux.php Diff File