LimeSurvey: develop 1a95d8a4

Diff Back to Repository
Author Committer Branch Timestamp Parent
TonisOrmisson TonisOrmisson develop 2017-11-08 17:27:16 develop e0ca7d4e
Changeset

Merge branch 'fix-tests-cleanup' into develop
mod - .gitignore Diff File
add - .travis.yml Diff File
add - CONTRIBUTING.md Diff File
rm - application/Psr4AutoloaderClass.php Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/ResetPasswordCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/commands/console.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/AdminController.php Diff File
mod - application/controllers/InstallerController.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/PluginHelper.php Diff File
add - application/controllers/admin/SettingsUserController.php Diff File
mod - application/controllers/admin/SurveymenuController.php Diff File
mod - application/controllers/admin/SurveymenuEntryController.php Diff File
add - application/controllers/admin/SurveysGroupsController.php Diff File
add - application/controllers/admin/TutorialEntryController.php Diff File
add - application/controllers/admin/TutorialsController.php Diff File
mod - application/controllers/admin/assessments.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/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.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/pluginmanager.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/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
add - application/controllers/admin/templateoptions.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.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/AuthPluginBase.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSWebUser.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/PluginBase.php Diff File
mod - application/core/PluginEvent.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/core/db/PgsqlSchema.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/Authwebserver/Authwebserver.php Diff File
mod - application/core/plugins/ExportR/ExportR.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
rm - application/core/plugins/QuickMenu/QuickMenu.php Diff File
rm - application/core/plugins/QuickMenu/QuickMenuButton.php Diff File
rm - application/core/plugins/QuickMenu/README.md Diff File
mod - application/core/plugins/extendedStartPage/extendedStartPage.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php Diff File
mod - application/extensions/FlashMessage/assets/js/notify.js Diff File
mod - application/extensions/PanelBoxWidget/PanelBoxWidget.php Diff File
mod - application/extensions/PanelBoxWidget/views/box.php Diff File
mod - application/extensions/PanelBoxWidget/views/row_header.php Diff File
mod - application/extensions/SettingsWidget/assets/settingswidget.js Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/assets/reload.js Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php Diff File
mod - application/extensions/admin/survey/question/PositionWidget/assets/reload_position.js Diff File
mod - application/extensions/bootstrap/helpers/TbHtml.php Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/assets/css/bootstrap-datetimepicker.min.css Diff File
mod - application/extensions/yiiwheels/widgets/datetimepicker/assets/js/bootstrap-datetimepicker.js Diff File
mod - application/extensions/yiiwheels/widgets/formhelpers/assets/js/bootstrap-formhelpers.js Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/clips/index.html Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/fontcolor/fontcolor/index.html Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/fontfamily/index.html Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/fontsize/index.html Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/fullscreen/index.html Diff File
mod - application/extensions/yiiwheels/widgets/redactor/assets/js/plugins/textdirection/index.html Diff File
mod - application/extensions/yiiwheels/widgets/select2/WhSelect2.php Diff File
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/ajax_helper.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/htmleditor_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/admin/template_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/globals.php Diff File
mod - application/helpers/ldap_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/helpers/questionIndexHelper.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/surveytranslator_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/MenuObjects/Menu.php Diff File
mod - application/libraries/MenuObjects/MenuInterface.php Diff File
mod - application/libraries/MenuObjects/MenuItem.php Diff File
mod - application/libraries/MenuObjects/MenuItemInterface.php Diff File
mod - application/libraries/MersenneTwister.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.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/PluginEventContent.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginAbstract.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/iQuestion.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/PluginManager/Storage/DummyStorage.php Diff File
mod - application/libraries/PluginManager/Storage/iPluginStorage.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/libraries/Save.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
mod - application/models/Assessment.php Diff File
mod - application/models/Boxes.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/FailedLoginAttempt.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/LabelSet.php Diff File
mod - application/models/Notification.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/ParticipantAttributeNameLang.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Plugin.php Diff File
mod - application/models/PluginDynamic.php Diff File
mod - application/models/PluginSetting.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/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/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/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/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/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/models/TutorialEntry.php Diff File
mod - application/models/Tutorials.php Diff File
mod - application/models/User.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/models/behaviors/PluginEventBehavior.php Diff File
mod - application/third_party/pchart/pCache.class.php Diff File
mod - application/third_party/pchart/pChart.class.php Diff File
mod - application/third_party/pchart/pData.class.php Diff File
mod - application/third_party/pchart/pchart/pCache.class Diff File
mod - application/third_party/pchart/pchart/pChart.class Diff File
mod - application/third_party/pchart/pchart/pData.class Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/includes/condition.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.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/databaseupdate/verify.php Diff File
mod - application/views/admin/dataentry/active_html_view.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/emailtemplates/email_language_template_tab.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_dataselection.php Diff File
mod - application/views/admin/export/statistics_subviews/_outputoptions.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/export/statistics_subviews/_response_filter_choice.php Diff File
mod - application/views/admin/export/statistics_subviews/_responseid.php Diff File
mod - application/views/admin/export/statistics_subviews/_submissiondate.php Diff File
mod - application/views/admin/export/statistics_user_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/expressions/test/conditions2relevance.php Diff File
mod - application/views/admin/expressions/test/functions.php Diff File
mod - application/views/admin/expressions/test/navigation_test.php Diff File
mod - application/views/admin/expressions/test/relevance.php Diff File
mod - application/views/admin/expressions/test/strings_with_expressions.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/expressions/test/survey_logic_form.php Diff File
mod - application/views/admin/expressions/test_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/global_settings/_bounce.php Diff File
mod - application/views/admin/global_settings/_email.php Diff File
mod - application/views/admin/global_settings/_general.php Diff File
mod - application/views/admin/global_settings/_interfaces.php Diff File
mod - application/views/admin/global_settings/_language.php Diff File
mod - application/views/admin/global_settings/_presentation.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/global_settings/_storage.php Diff File
mod - application/views/admin/global_settings/_storage_ajax.php Diff File
mod - application/views/admin/homepagesettings/_form.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/labels/_labelviewrightcontent_view.php Diff File
mod - application/views/admin/labels/_labelviewtabcontent_view.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/labels/labelsets_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/participants/modal_subviews/_addToSurvey.php Diff File
mod - application/views/admin/participants/modal_subviews/_deleteParticipant.php Diff File
mod - application/views/admin/participants/modal_subviews/_editAttribute.php Diff File
mod - application/views/admin/participants/modal_subviews/_editParticipant.php Diff File
mod - application/views/admin/participants/modal_subviews/_shareParticipant.php Diff File
mod - application/views/admin/participants/modal_subviews/_showParticipantSurveys.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/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/quotas/_form.php Diff File
mod - application/views/admin/quotas/_form_langsettings.php Diff File
mod - application/views/admin/quotas/_newanswer_equation.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotas_massive_selector.php Diff File
mod - application/views/admin/quotas/viewquotas_view.php Diff File
mod - application/views/admin/responses/browseallrow_view.php Diff File
mod - application/views/admin/responses/browseindex_view.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/saved/savedlist_view.php Diff File
mod - application/views/admin/settingsUser/index.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File