LimeSurvey: develop 212f771a

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2016-12-19 13:14:23 develop 0fd68403
Changeset

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

Conflicts:
application/config/version.php
application/controllers/survey/index.php
application/core/LSYii_Application.php
application/helpers/update/updatedb_helper.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/NotificationController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSCGettextMessageSource.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LSUserIdentity.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
add - application/core/plugins/CintLink/CintLink.php Diff File
add - application/core/plugins/CintLink/CintLinkAPI.php Diff File
add - application/core/plugins/CintLink/CintXml.php Diff File
add - application/core/plugins/CintLink/config.json Diff File
add - application/core/plugins/CintLink/css/bootstrap-tour.min.css Diff File
add - application/core/plugins/CintLink/css/cintlink.css Diff File
add - application/core/plugins/CintLink/css/icomoon.eot Diff File
add - application/core/plugins/CintLink/css/icomoon.svg Diff File
add - application/core/plugins/CintLink/css/icomoon.ttf Diff File
add - application/core/plugins/CintLink/css/icomoon.woff Diff File
add - application/core/plugins/CintLink/js/bootstrap-tour.min.js Diff File
add - application/core/plugins/CintLink/js/checkOrders.js Diff File
add - application/core/plugins/CintLink/js/cintlink.js Diff File
add - application/core/plugins/CintLink/js/tour.js Diff File
add - application/core/plugins/CintLink/model/CintLinkOrder.php Diff File
add - application/core/plugins/CintLink/views/activateFeedback.php Diff File
add - application/core/plugins/CintLink/views/buttons/cancelled.php Diff File
add - application/core/plugins/CintLink/views/buttons/hold.php Diff File
add - application/core/plugins/CintLink/views/common.php Diff File
add - application/core/plugins/CintLink/views/dashboard.php Diff File
add - application/core/plugins/CintLink/views/index.php Diff File
add - application/core/plugins/CintLink/views/indexGlobal.php Diff File
add - application/core/plugins/CintLink/views/loginform.php Diff File
add - application/core/plugins/CintLink/views/notifications/nagging.php Diff File
add - application/core/plugins/CintLink/views/notifications/tutorial.php Diff File
add - application/core/plugins/CintLink/views/notifications/warning_popup.php Diff File
add - application/core/plugins/CintLink/views/sidemenu.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/MenuObjects/Menu.php Diff File
mod - application/libraries/MenuObjects/MenuItem.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/PluginManager/PluginManager.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/models/Plugin.php Diff File
mod - application/models/QuestionGroup.php Diff File
add - application/models/UniqueNotification.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/layouts/main.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - scripts/admin/notifications.js Diff File
rm - tmp/assets/index.html Diff File