Damian Mooyman
|
d52db0ba34
|
Merge 3 into master
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
|
2016-04-29 17:50:55 +12:00 |
|
Daniel Hensby
|
a0812f987a
|
Merge 3.1 into 3.2
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
|
2016-04-26 00:09:33 +01:00 |
|
Damian Mooyman
|
6ec2656201
|
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
Fixes #5250
|
2016-04-01 11:04:06 +13:00 |
|
Ingo Schommer
|
589fee1a8a
|
Removed obsolete TestRunner->$skipTests flag
Taken care of by the default PHPUnit implementation of markTestSkipped()
|
2016-02-23 22:29:58 +13:00 |
|
Damian Mooyman
|
db0cad4616
|
BUG ErrorControlChain now supports exception handling
|
2014-09-26 16:54:34 +12:00 |
|
Simon Welsh
|
8de403abd4
|
Changes to error message detection to handle the differences in HHVM
|
2013-12-21 13:17:47 +13:00 |
|
Hamish Friedlander
|
342058742c
|
FIX Flush on memory exhaustion and headers sent
|
2013-08-02 09:41:16 +12:00 |
|
Hamish Friedlander
|
a1ea905ca8
|
FIX Nice errors and allows flush on module removal
|
2013-07-24 09:57:01 +12:00 |
|
Hamish Friedlander
|
1298d4a5bd
|
FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692)
|
2013-07-19 12:24:32 +12:00 |
|