Changesets: LimeSurvey
master 0e51fd1a 2016-07-22 13:03:14
|
Dev: ported 11415 to other models | ||
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 Details Diff |
Dev Cleanup | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
master 0523d581 2016-07-22 12:20:32 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 Details Diff |
Merge branch 'master' into cint | ||
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 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
|
dev removed outdated jstoolbox/datejs library Please watch out for date-issues | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
master 04aa3348 2016-07-22 11:17:03
|
dev hidden unused answer and helper field with equation/textfield questions | ||
mod - scripts/survey_runtime.js | Diff File | ||
master fa69b5bb 2016-07-22 11:11:19
|
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
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
|
dev googleanalytics default to useGlobalSettings | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
master 0c700518 2016-07-22 10:19:43
|
Dev: security fix, use libxml_disable_entity_loader for import/export | ||
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
|
Merge branch '11417' | ||
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
|
dev problem loading googleanalyticsapikey resolved | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
master 349e0088 2016-07-22 10:05:04
|
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
|
Dev: security fix, use libxml_disable_entity_loader for admin theme and survey templates configuration files | ||
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
|
dev replaced parsing with moment.js | ||
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 Details Diff |
Dev: Add CSS file (CintLink) | ||
add - application/core/plugins/CintLink/css/cintlink.css | Diff File | ||
cint b91b89ea 2016-07-22 08:23:41 Details Diff |
Dev: Don't fetch anything for cancelled order (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
cint 77fe2a63 2016-07-22 08:16:07 Details Diff |
Dev: Add td for cancelled order | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
cint 81d3c70d 2016-07-21 15:31:38 Details Diff |
Dev: Add logic to cancel order (CinkLink) | ||
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 Details Diff |
Merge branch 'master' into cint | ||
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 Details Diff |
Dev: Typo | ||
mod - application/config/internal.php | Diff File | ||
cint 42cc2251 2016-07-21 13:16:03 Details Diff |
Dev: Show loading screen while login and dashboard loading (CintLink) | ||
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 Details Diff |
Dev: Add new logger for Cint plugin | ||
mod - application/config/internal.php | Diff File | ||
master 5a39a5d0 2016-07-21 12:41:49
|
Dev: comment on simplexml fix | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
master 867f830c 2016-07-21 12:29:56
|
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 |