tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-17 08:53:59 +02:00
Code Issues Projects Releases Wiki Activity
a1dccaa8ff
silverstripe-framework/templates
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
..
email Removed Email Subclasses used by the Member class (Member_ChangePasswordEmail and Member_ForgotPasswordEmail). 2016-04-06 09:54:17 +02:00
filesystem API Asset Access Control implementation 2016-01-13 18:18:22 +13:00
forms Merge 3 into master 2016-04-29 17:50:55 +12:00
Includes Merge 3 into master 2016-04-29 17:50:55 +12:00
AssetField.ss API Implement AssetField to edit DBFile fields 2015-10-23 16:57:44 +13:00
AssetUploadField.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
BlankPage.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
Controller.ss API Moved frontend assets into admin/client/ 2016-04-20 21:13:10 +12:00
DBFile_download.ss API Implementation of RFC-1 Asset Abstraction 2015-09-24 12:57:28 +12:00
DBFile_image.ss API Implementation of RFC-1 Asset Abstraction 2015-09-24 12:57:28 +12:00
GridFieldDetailForm.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
HtmlEditorField_UploadField.ss Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
Image_iframe.ss Remove <IE10 specific workarounds 2016-04-11 14:50:00 +12:00
RightLabelledFieldHolder.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
RSSFeed.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
SapphireInfo.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
SearchForm.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
UploadField_FileEdit.ss MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
UploadField.ss FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288). 2015-10-06 15:03:49 -04:00