Changesets: LimeSurvey

master 0e51fd1a

2016-07-22 13:03:14

LouisGac

Details Diff
Dev: ported 11415 to other models
Attach Issues:
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantShare.php Diff File
mod - application/models/SurveyDynamic.php Diff File

master a463a2d6

2016-07-22 12:25:32

c_schmitz

Details Diff
Dev Cleanup
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 0523d581

2016-07-22 12:20:32

c_schmitz

Details Diff
Fixed issue 11412: When Using token conditions across scenarios the final condition becomes ORed Affected Issues
11412
mod - application/helpers/expressions/em_manager_helper.php Diff File

cint fa708b7b

2016-07-22 11:50:03

ollehar

Details Diff
Merge branch 'master' into cint
Attach Issues:
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/third_party/ar-php/Arabic/Date.php Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/survey_runtime.js Diff File

master f2ba6228

2016-07-22 11:49:04

ollehar

Details Diff
Fixed issue 11415: SQL error when filling token id in survey participant list Affected Issues
11415
mod - application/models/TokenDynamic.php Diff File

master e63ebb71

2016-07-22 11:17:50

markusfluer

Details Diff
dev removed outdated jstoolbox/datejs library Please watch out for date-issues
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File

master 04aa3348

2016-07-22 11:17:03

markusfluer

Details Diff
dev hidden unused answer and helper field with equation/textfield questions
Attach Issues:
mod - scripts/survey_runtime.js Diff File

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
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 657 658 659 660 661 662 663 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1450 1451 1452  Next  Last