Changesets: LimeSurvey
|
cint 00fb2d72 2016-07-25 12:04 Details Diff |
Dev: Indentation | ||
| mod - application/libraries/PluginManager/PluginBase.php | Diff File | ||
|
master 2f35e852 2016-07-22 16:46
Details Diff |
Dev: Merge branch 'preventLoops' | ||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/core/LSHttpRequest.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/survey/deleteSurvey_view.php | Diff File | ||
|
cint 11a281f8 2016-07-22 16:43 Details Diff |
Dev: Indentation | ||
| mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
|
master 9700ea22 2016-07-22 16:43
Details Diff |
Dev: Refactored the getUrlReferrer Method to always rely on The SimpleNavigationStack to prevent looping Dev: Removed every instnace of forbiddenUrlArray |
||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/core/LSHttpRequest.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/survey/deleteSurvey_view.php | Diff File | ||
|
master 839bbae7 2016-07-22 15:48 Details Diff |
Fixed issue 11445: Better identification of language variants for automatic language detection in administration |
Affected Issues 11445 |
|
| mod - application/helpers/common_helper.php | Diff File | ||
|
master ecde2116 2016-07-22 15:40
Details Diff |
Dev: implemented a simple Session stack to prevent navigation loops | ||
| mod - application/core/LSHttpRequest.php | Diff File | ||
|
master 0e51fd1a 2016-07-22 15:03
Details Diff |
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 14:25 Details Diff |
Dev Cleanup | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 0523d581 2016-07-22 14:20 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 13:50 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 13:49 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 13:17
Details Diff |
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 13:17
Details Diff |
dev hidden unused answer and helper field with equation/textfield questions | ||
| mod - scripts/survey_runtime.js | Diff File | ||
|
master fa69b5bb 2016-07-22 13:11
Details Diff |
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 13:10
Details Diff |
dev googleanalytics default to useGlobalSettings | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
|
master 0c700518 2016-07-22 12:19
Details Diff |
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 12:11
Details Diff |
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 12:10
Details Diff |
dev problem loading googleanalyticsapikey resolved | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
master 349e0088 2016-07-22 12:05
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 12:02
Details Diff |
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 11:49
Details Diff |
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 10:55 Details Diff |
Dev: Add CSS file (CintLink) | ||
| add - application/core/plugins/CintLink/css/cintlink.css | Diff File | ||
|
cint b91b89ea 2016-07-22 10:23 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 10:16 Details Diff |
Dev: Add td for cancelled order | ||
| mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
|
cint 81d3c70d 2016-07-21 17:31 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 | ||
