tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
da4c31cd50
silverstripe-framework/templates
History
Damian Mooyman 0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
..
email Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
forms Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
Includes API New and renamed image functions 2015-06-12 17:02:55 -07:00
AssetUploadField.ss
BlankPage.ss
Controller.ss MINOR Closing tag in Controller.ss 2014-12-04 15:41:10 +01:00
GridFieldDetailForm.ss API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
HtmlEditorField_UploadField.ss
Image_iframe.ss Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02: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
SearchForm.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
UploadField_FileEdit.ss
UploadField.ss FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 2013-12-19 09:11:31 +00:00