silverstripe-framework/tests
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
..
api MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
assets FIX extra_requirements to accept non associative arrays. 2013-06-02 13:37:34 +12:00
behat Merge 3 into master 2016-04-29 17:50:55 +12:00
cache Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
control Merge 3 into master 2016-04-29 17:50:55 +12:00
core Merge 3 into master 2016-04-29 17:50:55 +12:00
dev API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
email Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
filesystem Merge 3 into master 2016-04-29 17:50:55 +12:00
forms Merge 3 into master 2016-04-29 17:50:55 +12:00
i18n MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
injector Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
integration Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
javascript API Removed custom dev/tests/ execution 2016-02-23 20:19:35 +13:00
model Merge 3 into master 2016-04-29 17:50:55 +12:00
oembed Add unit tests for oembed autodiscover and thumbnail detection 2016-04-15 14:00:10 +12:00
parsers MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
phpcs Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
search Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
security Merge 3 into master 2016-04-29 17:50:55 +12:00
tasks Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
templates MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
testing MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
view API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
Bare.yml MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests. 2011-02-02 14:17:57 +13:00
bootstrap.php API Removed custom dev/tests/ execution 2016-02-23 20:19:35 +13:00
FakeController.php FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
MemoryLimitTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
phpcs_runner.php Only have Scrutinizer check PHP files 2013-08-21 21:02:12 +12:00
PhpSyntaxTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00