Changesets: LimeSurvey
|
develop 96c72f02 2017-08-22 15:20:23
|
Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop | ||
| mod - application/models/SurveyTimingDynamic.php | Diff File | ||
|
develop bf78d628 2017-08-22 15:20:01
|
Dev: added onPluginRegistration event | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
|
master 30633f4a 2017-08-22 14:25:42 Details Diff |
Dev: Some more EM tests | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 5ced08cc 2017-08-22 14:25:42 Committer: |
Dev: Some more EM tests | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
master 2e08a1da 2017-08-22 12:36:30 Details Diff |
Dev: Add EM test for 3 + '2' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 9e2b15cc 2017-08-22 12:36:30 Committer: |
Dev: Add EM test for 3 + '2' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
master 01b9c158 2017-08-22 12:16:27 Details Diff |
Dev: Factor out getMismatchInformation() | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
|
develop cd7f13c1 2017-08-22 12:16:27 Committer: |
Dev: Factor out getMismatchInformation() | ||
| mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
|
master 9b8ce149 2017-08-22 12:11:44 Details Diff |
Dev: Even more tests | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 127e99ab 2017-08-22 12:11:44 Committer: |
Dev: Even more tests | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
master 82b3b2f9 2017-08-22 11:52:28 Details Diff |
Dev: Add new expression test for '' >= '' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 4c1b53d3 2017-08-22 11:52:28 Committer: |
Dev: Add new expression test for '' >= '' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
master 47503572 2017-08-22 11:48:54 Details Diff |
Dev: Add new expression test for '' >= ' ' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 0c9d4e16 2017-08-22 11:48:54 Committer: |
Dev: Add new expression test for '' >= ' ' | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 14bd2b3e 2017-08-22 11:42:41
|
Dev:Dev: moved classes, id and attribute to core language changer top menu | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - templates/default/views/subviews/navigation/language_changer_top_menu.twig | Diff File | ||
|
develop 95481750 2017-08-22 11:13:44
|
Dev: moved classes, id and attribute to core for clearall_links.twig | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - templates/default/views/subviews/navigation/clearall_links.twig | Diff File | ||
|
develop 385b156a 2017-08-22 11:06:12
|
Dev: moved classes, id and attribute to core for privacy.twig | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - templates/default/views/subviews/privacy/privacy.twig | Diff File | ||
|
develop a251ed8b 2017-08-22 10:29:48 Details Diff |
Dev: Make sure self::$survey is not empty | ||
| mod - application/models/SurveyTimingDynamic.php | Diff File | ||
|
develop 99a29199 2017-08-21 18:10:34
|
Dev: moved bootstrap plugins to bootstrap folder | ||
| mod - application/config/packages.php | Diff File | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/extensions/yiiwheels/widgets/select2/WhSelect2.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/css/select2-bootstrap.css | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/css/select2.css | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/img/select2-spinner.gif | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/img/select2.png | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/img/select2x2.png | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ar.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/az.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/bg.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ca.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/cs.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/da.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/de.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/en.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/es.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/et.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/eu.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/fa.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/fi.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/fr.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/gl.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/he.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/hi.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/hr.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/hu.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/id.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/is.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/it.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ja.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ko.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/lt.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/lv.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/mk.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ms.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/nb.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/nl.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/pl.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/pt-BR.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/pt.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ro.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/ru.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/sk.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/sr-Cyrl.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/sr.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/sv.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/th.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/tr.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/uk.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/vi.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/zh-CN.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/i18n/zh-TW.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/select2.full.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/select2.full.min.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/select2.js | Diff File | ||
| add - assets/packages/bootstrap/plugins/select2/js/select2.min.js | Diff File | ||
| rm - third_party/bootstrap-datetimepicker/.bower.json | Diff File | ||
|
develop fecaa2a5 2017-08-21 17:36:13
|
Dev: fixed list item handling in em | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
develop f4615392 2017-08-21 17:18:42
|
Dev: small bug in database.php | ||
| mod - application/controllers/admin/database.php | Diff File | ||
|
master 55ac06b8 2017-08-21 16:38:44 Details Diff |
Dev: No errors after PHP evaluation | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 5b17aaf0 2017-08-21 16:38:44 Committer: |
Dev: No errors after PHP evaluation | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
develop 2a8f23b1 2017-08-21 16:38:44 Committer: |
Dev: No errors after PHP evaluation | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
|
master 99e15e1c 2017-08-21 16:12:12 Details Diff |
Dev: Check that node is installed before running EM tests | ||
| mod - tests/helpers/ExpressionCoreHelperTest.php | Diff File | ||
