LimeSurvey: master 97f1c8e2

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz master 2017-12-21 00:26 master 69e9a7f8
Changeset

Dev Merge branch 'develop' to master
add - .editorconfig Diff File
mod - .gitignore Diff File
mod - .htaccess Diff File
mod - .scrutinizer.yml Diff File
add - .travis.yml Diff File
mod - README.md Diff File
rm - application/Psr4AutoloaderClass.php Diff
add - application/commands/CompileAssetsCommand.php Diff File
add - application/commands/FlushAssetsCommand.php Diff File
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/PluginCommand.php Diff File
mod - application/commands/ResetPasswordCommand.php Diff File
add - application/commands/UpdateDbCommand.php Diff File
mod - application/commands/WipeCommand.php Diff File
mod - application/commands/console.php Diff File
mod - application/commands/starter.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
add - application/config/console.php Diff File
mod - application/config/email.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/ldap.php Diff File
add - application/config/packages.php Diff File
mod - application/config/routes.php Diff File
mod - application/config/tcpdf.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/updater_version.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/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PluginsController.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/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/PluginHelper.php Diff File
add - application/controllers/admin/SettingsUserController.php Diff File
add - application/controllers/admin/SurveymenuController.php Diff File
add - 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/checkintegrity.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/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/emailtemplates.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/htmleditor_pop.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/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.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
rm - application/controllers/admin/templates.php Diff
add - application/controllers/admin/themeoptions.php Diff File
add - application/controllers/admin/themes.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/ConsoleApplication.php Diff File
mod - application/core/LSAuthResult.php Diff File
add - application/core/LSCGettextMessageSource.php Diff File
mod - application/core/LSDbCriteria.php Diff File
add - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.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
add - application/core/LSYii_AssetManager.php Diff File
mod - application/core/LSYii_CaseValidator.php Diff File
mod - application/core/LSYii_ClientScript.php Diff File
mod - application/core/LSYii_CompareInsensitiveValidator.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Locale.php Diff File
mod - application/core/LSYii_Validators.php Diff File
add - 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/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
add - application/core/WrongTemplateVersionException.php Diff File
mod - application/core/db/DbConnection.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/ExportR/RDataWriter.php Diff File
mod - application/core/plugins/ExportR/RSyntaxWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
rm - application/core/plugins/QuickMenu/QuickMenu.php Diff
rm - application/core/plugins/QuickMenu/QuickMenuButton.php Diff
rm - application/core/plugins/QuickMenu/README.md Diff
mod - application/core/plugins/extendedStartPage/extendedStartPage.php Diff File
mod - application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php Diff File
mod - application/core/web/DbHttpSession.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_footer.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/MassiveActionsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/empty.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/first-select.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/views/selector.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/ListSurveysWidget.php 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/_selector.php Diff File
mod - application/extensions/admin/survey/question/PositionWidget/assets/reload_position.js Diff File
mod - application/extensions/bootstrap/gii/bootstrap/views/index.php Diff File
mod - application/extensions/bootstrap/helpers/TbHtml.php Diff File
mod - application/extensions/bootstrap/tests/unit/TbHtmlTest.php Diff File
mod - application/extensions/questionTypes/listRadio/config.xml Diff File
mod - application/extensions/questionTypes/listRadio/listRadio.php Diff File
mod - application/extensions/yiiwheels/widgets/daterangepicker/assets/js/daterangepicker.js 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/fileupload/assets/js/cors/jquery.postmessage-transport.js Diff File
mod - application/extensions/yiiwheels/widgets/fileupload/assets/js/jquery.fileupload.js Diff File
mod - application/extensions/yiiwheels/widgets/fileupload/assets/js/jquery.iframe-transport.js Diff File
mod - application/extensions/yiiwheels/widgets/formhelpers/assets/js/bootstrap-formhelpers.js Diff File
mod - application/extensions/yiiwheels/widgets/formhelpers/assets/js/bootstrap-formhelpers.min.js Diff File
mod - application/extensions/yiiwheels/widgets/google/WhVisualizationChart.php Diff File
mod - application/extensions/yiiwheels/widgets/grid/WhToggleColumn.php Diff File
mod - application/extensions/yiiwheels/widgets/highcharts/assets/js/highcharts-all.js Diff File
mod - application/extensions/yiiwheels/widgets/highcharts/assets/js/highcharts.js Diff File
mod - application/extensions/yiiwheels/widgets/highcharts/assets/js/highcharts.src.js Diff File
mod - application/extensions/yiiwheels/widgets/multiselect/WhMultiSelect.php Diff File
mod - application/extensions/yiiwheels/widgets/multiselect/assets/js/bootstrap-multiselect.js Diff File
mod - application/extensions/yiiwheels/widgets/rangeslider/WhRangeSlider.php Diff File
mod - application/extensions/yiiwheels/widgets/redactor/WhRedactor.php 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/sparklines/assets/js/jquery.sparkline.js Diff File
mod - application/extensions/yiiwheels/widgets/sparklines/assets/js/jquery.sparkline.min.js Diff File
mod - application/extensions/yiiwheels/widgets/switch/WhSwitch.php Diff File
mod - application/extensions/yiiwheels/widgets/timepicker/WhTimePicker.php Diff File
mod - application/extensions/yiiwheels/widgets/timepicker/assets/js/bootstrap-timepicker.js Diff File
mod - application/extensions/yiiwheels/widgets/timepicker/assets/js/bootstrap-timepicker.min.js Diff File
mod - application/helpers/ClassFactory.php Diff File
mod - application/helpers/Hash.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/Zend/Exception.php Diff File
mod - application/helpers/Zend/Server/Abstract.php Diff File
mod - application/helpers/Zend/Server/Cache.php Diff File
mod - application/helpers/Zend/Server/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Callback.php Diff File
mod - application/helpers/Zend/Server/Method/Definition.php Diff File
mod - application/helpers/Zend/Server/Method/Parameter.php Diff File
mod - application/helpers/Zend/Server/Method/Prototype.php Diff File
mod - application/helpers/Zend/Server/Reflection.php Diff File
mod - application/helpers/Zend/Server/Reflection/Function/Abstract.php Diff File
mod - application/helpers/Zend/Server/Reflection/Node.php Diff File
mod - application/helpers/Zend/XmlRpc/Client.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/Exception.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/FaultException.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/HttpException.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/IntrospectException.php Diff File
mod - application/helpers/Zend/XmlRpc/Client/ServerIntrospection.php Diff File
mod - application/helpers/Zend/XmlRpc/Exception.php Diff File
mod - application/helpers/Zend/XmlRpc/Fault.php Diff File
mod - application/helpers/Zend/XmlRpc/Generator/GeneratorAbstract.php Diff File
mod - application/helpers/Zend/XmlRpc/Generator/XmlWriter.php Diff File
mod - application/helpers/Zend/XmlRpc/Request.php Diff File
mod - application/helpers/Zend/XmlRpc/Request/Http.php Diff File
mod - application/helpers/Zend/XmlRpc/Response.php Diff File
mod - application/helpers/Zend/XmlRpc/Response/Http.php Diff File
mod - application/helpers/Zend/XmlRpc/Server.php Diff File
mod - application/helpers/Zend/XmlRpc/Server/Fault.php Diff File
mod - application/helpers/Zend/XmlRpc/Server/System.php Diff File
mod - application/helpers/Zend/XmlRpc/Value.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Array.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Base64.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Boolean.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Collection.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/DateTime.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Double.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Exception.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Integer.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Scalar.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/String.php Diff File
mod - application/helpers/Zend/XmlRpc/Value/Struct.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/backupdb_helper.php Diff File
mod - application/helpers/admin/export/CsvWriter.php Diff File
mod - application/helpers/admin/export/DocWriter.php Diff File
mod - application/helpers/admin/export/ExcelWriter.php Diff File
mod - application/helpers/admin/export/FormattingOptions.php Diff File
mod - application/helpers/admin/export/HtmlWriter.php Diff File
mod - application/helpers/admin/export/IWriter.php Diff File
mod - application/helpers/admin/export/JsonWriter.php Diff File
mod - application/helpers/admin/export/PdfWriter.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/Translator.php Diff File
mod - application/helpers/admin/export/Writer.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/label_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/admin/survey_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/adodb/adodb-time.inc_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/globalsettings_helper.php Diff File
mod - application/helpers/ldap_helper.php Diff File
mod - application/helpers/pdfHelper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
add - 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/update_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/BigData.php Diff File
mod - application/libraries/Date_Time_Converter.php Diff File
mod - application/libraries/LS/LS.php Diff File
mod - application/libraries/LSZend_XmlRpc_Response_Http.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
rm - application/libraries/Load_answers.php Diff
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/EventDocumentor.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