LimeSurvey: master f1b3ec6c

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 master 2020-04-20 12:09:17 master 9388a780
Changeset

Merge branch 'develop' into bug/OP-674-anonymize-ip-adress

mod - application/config/packages.php Diff File
mod - application/controllers/admin/ExpressionValidate.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/themeoptions.php Diff File
mod - application/core/LS_Twig_Extension.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/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php Diff File
mod - application/views/survey/questions/question_help/mandatory_tip.twig Diff File
rm - assets/packages/adapters/jquery.js Diff File
add - assets/packages/expressionscript/expression.js Diff File
add - assets/packages/expressionscript/expressions.css Diff File
rm - assets/scripts/admin/ckeditor-config.js Diff File