LimeSurvey: develop e536ed2d

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-06-29 11:17:14 develop 28a835ef
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/admin/expressions.php
application/core/LSHttpRequest.php
application/helpers/admin/import_helper.php
mod - .gitignore 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
mod - application/config/questiontypes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/core/db/MssqlSchema.php Diff File
mod - application/extensions/LimeScript/LimeScript.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_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/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/views/admin/expressions/test/functions.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.php Diff File
mod - application/views/admin/survey/subview/tab_edit_view.php Diff File
mod - application/views/admin/survey/surveybar_displayexport.php Diff File
mod - application/views/admin/themes/templatesummary_view.php Diff File
mod - application/views/survey/questions/question_timer/timer_footer.php Diff File
mod - assets/packages/adminbasics/js/admin_core.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.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
add - assets/packages/bootstrap/plugins/bootstrapconfirm/README.md Diff File
add - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.js Diff File
add - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.min.js Diff File
add - assets/packages/bootstrap/plugins/bootstrapconfirm/bootstrapconfirm.src.js Diff File
add - assets/packages/bootstrap/plugins/bootstrapconfirm/compile.sh Diff File
add - assets/packages/bootstrap/plugins/bootstrapconfirm/package.json Diff File
mod - assets/packages/limesurvey/survey.js Diff File
add - assets/packages/questions/timer/.babelrc Diff File
add - assets/packages/questions/timer/package-lock.json Diff File
add - assets/packages/questions/timer/package.json Diff File
add - assets/packages/questions/timer/src/main.js Diff File
add - assets/packages/questions/timer/src/timeclass.js Diff File
add - assets/packages/questions/timer/timer.js Diff File
add - assets/packages/questions/timer/timer.min.js Diff File
add - assets/packages/questions/timer/webpack.config.js Diff File
add - assets/packages/questions/timer/yarn.lock Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - docs/release_notes.txt 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/hr/hr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/ja/ja.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - themes/survey/fruity/options/options.js Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/fruity/options/spectrum.css Diff File
mod - themes/survey/vanilla/config.xml Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/views/subviews/registration/register_form.twig Diff File
add - third_party/datatables/css/dataTables.bootstrap.min.css Diff File
add - third_party/datatables/css/dataTables.bootstrap4.css Diff File
add - third_party/datatables/css/dataTables.bootstrap4.min.css Diff File
add - third_party/datatables/css/dataTables.jqueryui.min.css Diff File
add - third_party/datatables/css/dataTables.semanticui.css Diff File
add - third_party/datatables/css/dataTables.semanticui.min.css Diff File
add - third_party/datatables/css/datatables.min.css Diff File
add - third_party/datatables/css/jquery.dataTables.min.css Diff File
add - third_party/datatables/js/dataTables.bootstrap4.js Diff File
add - third_party/datatables/js/dataTables.bootstrap4.min.js Diff File
add - third_party/datatables/js/dataTables.foundation.min.js Diff File
add - third_party/datatables/js/dataTables.semanticui.js Diff File
add - third_party/datatables/js/dataTables.semanticui.min.js Diff File
add - third_party/datatables/js/datatables.min.js Diff File
add - third_party/datatables/js/jquery.dataTables.min.js Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.bootstrap.min.css Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/css/dataTables.jqueryui.min.css Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables.min.css Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/css/jquery.dataTables_themeroller.css Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/js/dataTables.foundation.min.js Diff File
rm - third_party/jquery-datatable/DataTables-1.10.12/js/jquery.dataTables.min.js Diff File
rm - third_party/jquery-datatable/datatables.min.css Diff File
rm - third_party/jquery-datatable/datatables.min.js Diff File