Changesets: LimeSurvey
cint 1e09d610 2016-07-21 15:23 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 15:20 Details Diff |
Dev: Typo | ||
mod - application/config/internal.php | Diff File | ||
cint 42cc2251 2016-07-21 15:16 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 15:15 Details Diff |
Dev: Add new logger for Cint plugin | ||
mod - application/config/internal.php | Diff File | ||
master 5a39a5d0 2016-07-21 14:41
Details Diff |
Dev: comment on simplexml fix | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
master 867f830c 2016-07-21 14:29
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 13:56 Details Diff |
Dev: Update orders when loading the dashboard (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
master f8c8fb90 2016-07-21 12:42
Details Diff |
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
master a88e4d93 2016-07-21 12:42
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 11:34
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 ) |
||
mod - application/models/TemplateConfiguration.php | Diff File | ||
cint e63e2aed 2016-07-21 11:03 Details Diff |
Merge branch 'master' into cint | ||
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 11:02 Details Diff |
Dev: order_id must be ctl_order_id to pre-populate in nbill (CintLink) | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
master 70358e01 2016-07-20 17:52
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 | ||
master d7bcbfa6 2016-07-20 15:48
Details Diff |
Fixed Issue 11464: Corrected value definition of show_register switch |
Affected Issues 11464 |
|
mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
master d8858d64 2016-07-20 15:08 Details Diff |
Fixed issue: Bounce handling doesn't work if the related participant of a bounced email was deleted | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
master 2cbc1632 2016-07-20 14:47 Details Diff |
Dev Implemented the possibility of silent Db version updates Dev See https://manual.limesurvey.org/Database_versioning#What_is_a_critical_database_version_update.3F for more information |
||
mod - application/controllers/AdminController.php | Diff File | ||
mod - application/helpers/update/update_helper.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
master 63a68c1c 2016-07-20 12:43
Details Diff |
dev corrected deactivateConsole to use the proper yiimethod | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
mod - scripts/admin/tokens.js | Diff File | ||
mod - scripts/deactivatedebug.js | Diff File | ||
master 069bd62f 2016-07-20 12:20
Details Diff |
dev Expanded TemplateConfigureation with a possibility to silence console.log statements. Added a small script to stop console logs from popping up outside of dev mode | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
add - scripts/deactivatedebug.js | Diff File | ||
master f5259fc4 2016-07-20 12:18
Details Diff |
Fixed Issue 11480 Capsuled error in try/catch Block |
Affected Issues 11480 |
|
mod - scripts/admin/tokens.js | Diff File | ||
cint 38af6f7d 2016-07-20 10:21 Details Diff |
Merge branch 'master' into cint | ||
mod - application/controllers/admin/responses.php | Diff File | ||
mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
mod - scripts/admin/listresponse.js | Diff File | ||
cint 93af3db4 2016-07-20 10:20 Details Diff |
Dev: Save survey id and ordered by (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 | ||
master 57e86586 2016-07-20 09:48
Details Diff |
dev debug removed | ||
mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
master 7752d0ad 2016-07-19 16:56
Details Diff |
Fixed Issue 11479: Response View toggeling compact/extended now works |
Affected Issues 11479 |
|
mod - application/controllers/admin/responses.php | Diff File | ||
mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
master 679954dc 2016-07-19 16:38 Markus Flür Committer: GitHub Details Diff |
dev removed console.log | ||
mod - scripts/admin/listresponse.js | Diff File | ||
cint 34887edc 2016-07-19 16:04 Details Diff |
Dev: Add two new fields in cintlink order table (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File |