LimeSurvey: master_13513 41d34bc8

Author Committer Branch Timestamp Parent
DenisChenu DenisChenu master_13513 2018-10-10 18:38 master_13513 eab63d1e
Changeset

Merge branch 'develop' of git@github.com:LimeSurvey/LimeSurvey.git into master_13513

mod - .gitignore Diff File
mod - .travis.yml Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/PluginManagerController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/plugins/Authdb/config.xml Diff File
mod - application/core/plugins/Authwebserver/config.xml Diff File
mod - application/core/plugins/UpdateCheck/UpdateCheck.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionInstaller.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionUpdater.php Diff File
mod - application/libraries/ExtensionInstaller/ExtensionUpdaterServiceLocator.php Diff File
mod - application/libraries/ExtensionInstaller/PluginInstaller.php Diff File
mod - application/libraries/ExtensionInstaller/PluginUpdater.php Diff File
add - application/libraries/ExtensionInstaller/ThemeUpdater.php Diff File
mod - application/libraries/MenuObjects/Menu.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/ExtensionConfig.php Diff File
mod - application/models/Plugin.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/SurveyDynamic.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/behaviors/PluginEventBehavior.php Diff File
mod - application/views/admin/pluginmanager/index.php Diff File
mod - application/views/admin/pluginmanager/uploadConfirm.php Diff File
mod - application/views/admin/survey/QuestionGroups/listquestiongroups.php Diff File
mod - assets/packages/adminpanel/build/hammer.min.js 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/build/surveysettings.min.js Diff File
mod - assets/scripts/admin/plugin_manager.js Diff File
mod - docs/release_notes.txt 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/es/es.mo Diff File
mod - locale/gl/gl.mo Diff File
mod - locale/hr/hr.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - themes/survey/bootswatch/config.xml Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/vanilla/config.xml Diff File