LimeSurvey: develop f56b145e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2017-02-17 17:35:22 develop 3981feab
Changeset

Merge remote-tracking branch 'origin/master' into develop

Conflicts:
application/libraries/PluginManager/PluginManager.php
mod - application/commands/PluginCommand.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.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/pluginmanager.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.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/LSYii_Application.php Diff File
rm - application/core/PluginBase.php Diff File
rm - application/core/PluginEvent.php Diff File
rm - application/core/PluginManager.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/oldUrlCompat/oldUrlCompat.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/questionHelper.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Question/QuestionPluginBase.php Diff File
mod - application/libraries/PluginManager/iPlugin.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File