LimeSurvey: develop 04a0ec04

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz develop 2018-01-12 13:01:39 develop 091e11fd
Changeset

Merge branch 'master' into develop
mod - application/config/config-sample-mysql.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/core/db/DbConnection.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/views/admin/super/layout_insurvey.php Diff File
add - application/views/admin/survey/_activation_error.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - assets/packages/adminpanel/build/hammer.min.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.css 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.js.map Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.css Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/scss/custom.scss Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_questionsgroups.vue Diff File
mod - assets/packages/adminpanel/src/main.js Diff File
mod - assets/packages/adminpanel/src/store/vuex-store.js Diff File
mod - assets/scripts/admin/labels.js Diff File
mod - themes/survey/fruity/config.xml Diff File
mod - themes/survey/fruity/options/options.js Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/fruity/views/subviews/header/custom_header.twig Diff File