Changesets: LimeSurvey

Search Browse Back to Index

master fa69b5bb

2016-07-22 11:11:19

markusfluer

Details Diff 		Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
Attach Issues:
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/ar-php/Arabic/Date.php Diff File

master 6da63140

2016-07-22 11:10:58

markusfluer

Details Diff 		dev googleanalytics default to useGlobalSettings
Attach Issues:
mod - application/controllers/admin/surveyadmin.php Diff File

master 0c700518

2016-07-22 10:19:43

LouisGac

Details Diff 		Dev: security fix, use libxml_disable_entity_loader for import/export
Attach Issues:
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Question.php Diff File
mod - application/third_party/ar-php/Arabic/Date.php Diff File

master 8d8928d2

2016-07-22 10:11:03

markusfluer

Details Diff 		Merge branch '11417'
Attach Issues:
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - scripts/expressions/em_javascript.js Diff File

master c1a44779

2016-07-22 10:10:51

markusfluer

Details Diff 		dev problem loading googleanalyticsapikey resolved
Attach Issues:
mod - application/helpers/replacements_helper.php Diff File

master 349e0088

2016-07-22 10:05:04

markusfluer

Details Diff 		Fixed Issue 11417: Dates not calculating properly
dev Please look out for usages of the deprecated jstoolbox/date.js library, though it may be removed in the future
dev updated strtotime out of the php.js library		 Affected Issues
11417
mod - application/helpers/expressions/em_core_helper.php Diff File

master fe57ea36

2016-07-22 10:02:17

LouisGac

Details Diff 		Dev: security fix, use libxml_disable_entity_loader for admin theme and survey templates configuration files
Attach Issues:
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/TemplateConfiguration.php Diff File

master a8059056

2016-07-22 09:49:31

markusfluer

Details Diff 		dev replaced parsing with moment.js
Attach Issues:
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - scripts/expressions/em_javascript.js Diff File

cint cc2a8620

2016-07-22 08:55:44

ollehar

Details Diff 		Dev: Add CSS file (CintLink)
Attach Issues:
add - application/core/plugins/CintLink/css/cintlink.css Diff File

cint b91b89ea

2016-07-22 08:23:41

ollehar

Details Diff 		Dev: Don't fetch anything for cancelled order (CintLink)
Attach Issues:
mod - application/core/plugins/CintLink/CintLink.php Diff File

cint 77fe2a63

2016-07-22 08:16:07

ollehar

Details Diff 		Dev: Add td for cancelled order
Attach Issues:
mod - application/core/plugins/CintLink/views/dashboard.php Diff File

cint 81d3c70d

2016-07-21 15:31:38

ollehar

Details Diff 		Dev: Add logic to cancel order (CinkLink)
Attach Issues:
mod - application/core/plugins/CintLink/CintLink.php Diff File
mod - application/core/plugins/CintLink/CintLinkAPI.php Diff File
mod - application/core/plugins/CintLink/js/cintlink.js Diff File
mod - application/core/plugins/CintLink/views/dashboard.php Diff File

cint 1e09d610

2016-07-21 13:23:24

ollehar

Details Diff 		Merge branch 'master' into cint
Attach Issues:
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
add - scripts/admin/survey_edit_notificationpanel.js Diff File

cint 0b566fe4

2016-07-21 13:20:30

ollehar

Details Diff 		Dev: Typo
Attach Issues:
mod - application/config/internal.php Diff File

cint 42cc2251

2016-07-21 13:16:03

ollehar

Details Diff 		Dev: Show loading screen while login and dashboard loading (CintLink)
Attach Issues:
mod - application/core/plugins/CintLink/CintLink.php Diff File
mod - application/core/plugins/CintLink/js/cintlink.js Diff File
mod - application/core/plugins/CintLink/views/dashboard.php Diff File
mod - application/core/plugins/CintLink/views/index.php Diff File

cint d5fb5a56

2016-07-21 13:15:36

ollehar

Details Diff 		Dev: Add new logger for Cint plugin
Attach Issues:
mod - application/config/internal.php Diff File

master 5a39a5d0

2016-07-21 12:41:49

LouisGac

Details Diff 		Dev: comment on simplexml fix
Attach Issues:
mod - application/models/TemplateConfiguration.php Diff File

master 867f830c

2016-07-21 12:29:56

LouisGac

Details Diff 		Fixed issue 11405: .css and .js not loading on public pages
Fixed issue 11476: CSS and JS files not included at "default" template though {TEMPLATECSS} and {TEMPLATEJS} placeholders exist		 Affected Issues
11405, 11476
mod - application/models/TemplateConfiguration.php Diff File

cint 12b7eef6

2016-07-21 11:56:33

ollehar

Details Diff 		Dev: Update orders when loading the dashboard (CintLink)
Attach Issues:
mod - application/core/plugins/CintLink/CintLink.php Diff File
mod - application/core/plugins/CintLink/views/dashboard.php Diff File

master f8c8fb90

2016-07-21 10:42:45

markusfluer

Details Diff 		Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
Attach Issues:
mod - application/models/TemplateConfiguration.php Diff File

master a88e4d93

2016-07-21 10:42:39

markusfluer

Details Diff 		Fixed Bug 11416: Google Analytics Global Configuration is not being used by survey
dev Added the possibility to use Global, self-defined or non at all google analytics in a survey. Reused The buttongroup of Token/Bounce Settings
dev Added some nice effect, hiding the disabled inputs		 Affected Issues
11416
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/survey/subview/accordion/_notification_panel.php Diff File
add - scripts/admin/survey_edit_notificationpanel.js Diff File

master 97ed3167

2016-07-21 09:34:55

LouisGac

Details Diff 		Dev: reverted "Merge pull request #518 from hermannschwaerzlerUIBK/master"
Dev: wasn't really solving the problem for old PHP version, and created new problems for some recent PHP versions (original code returned an array of strings, whereas the PR was returning an array of objects, rising a warning for some recent PHP version )
Attach Issues:
mod - application/models/TemplateConfiguration.php Diff File

cint e63e2aed

2016-07-21 09:03:01

ollehar

Details Diff 		Merge branch 'master' into cint
Attach Issues:
mod - .gitignore Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - scripts/admin/tokens.js Diff File
add - scripts/deactivatedebug.js Diff File

cint 3afd75cf

2016-07-21 09:02:44

ollehar

Details Diff 		Dev: order_id must be ctl_order_id to pre-populate in nbill (CintLink)
Attach Issues:
mod - application/core/plugins/CintLink/views/dashboard.php Diff File

master 70358e01

2016-07-20 15:52:40

markusfluer

Details Diff 		Fixed Issue 11470: Setting Question To "Mandatory" after a publish deletes the "Other" answer option
dev corrected the hidden input for other to use integer values
dev added xdebug launch.json to gitignore		 Affected Issues
11470
mod - .gitignore Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 670 671 672 673 674 675 676 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1463 1464 1465  Next  Last