tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-16 14:36:26 +02:00
Code Issues Projects Releases Wiki Activity
e7cd864ebc
silverstripe-framework/model
History
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
..
connect Merge 3 into master 2016-04-29 17:50:55 +12:00
FieldType Merge 3 into master 2016-04-29 17:50:55 +12:00
queries Merge 3 into master 2016-04-29 17:50:55 +12:00
versioning i18n for campaigns section 2016-04-26 15:32:09 +12:00
ArrayList.php Merge 3 into master 2016-04-29 17:50:55 +12:00
DatabaseAdmin.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-15 13:18:47 +12:00
DataDifferencer.php API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
DataExtension.php API File has Versioned extension 2016-02-23 13:46:28 +13:00
DataList.php Merge 3 into master 2016-04-29 17:50:55 +12:00
DataModel.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataObject.php API Add i18n pluralisation 2016-04-14 12:01:42 +12:00
DataObjectInterface.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DataQuery.php Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
DB.php Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
Filterable.php API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List 2014-07-30 11:07:01 +12:00
GroupedList.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
HasManyList.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
HiddenClass.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Hierarchy.php Replaced filterByCallback for 'Children' to just create a new array as function calls are exponentially expensive in PHP (the more functions that exist, the slower a function call becomes) and replaced 'array_key_exists' with op-code equivalent for speed. The best increase isn't really noticeable but we should work towards optimizing the core as much as possible. 2016-01-25 13:22:51 +00:00
HTMLValue.php API Update TinyMCE to 4.x 2016-02-23 10:10:02 +13:00
Image_Backend.php Cleanup trailing whitespace 2016-03-09 10:20:31 +13:00
Image.php Merge 3.3 into 3 2016-04-26 00:24:59 +01:00
Limitable.php API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List 2014-07-30 11:07:01 +12:00
List.php API Standardise SS_List::map() implementation 2016-01-25 10:22:47 +13:00
ListDecorator.php Merge pull request #3828 from dhensby/pulls/byids-arraylist 2016-04-26 17:52:22 +12:00
ManyManyList.php API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 2016-03-22 18:09:30 +13:00
Map.php API Standardise SS_List::map() implementation 2016-01-25 10:22:47 +13:00
PolymorphicHasManyList.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Relation.php API Cleanup and refactor of select fields 2016-01-21 15:40:19 +13:00
RelationList.php API Massive refactor of Versioned 2016-03-17 13:43:53 +13:00
Sortable.php API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List 2014-07-30 11:07:01 +12:00
Transliterator.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
UnsavedRelationList.php Merge pull request #3828 from dhensby/pulls/byids-arraylist 2016-04-26 17:52:22 +12:00
URLSegmentFilter.php Remove question marks, equal signs and hashes 2016-01-22 15:40:11 +00:00
ValidationException.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ValidationResult.php API Asset Access Control implementation 2016-01-13 18:18:22 +13:00