silverstripe-framework/templates
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
email Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
forms Merge commit 'ec0c259' into 3 2015-01-07 14:26:19 +13:00
Includes Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
AssetUploadField.ss BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231. 2013-02-04 14:15:27 +13:00
BlankPage.ss MINOR HTML5 for BlankPage.ss default template 2012-04-13 15:32:05 +02:00
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 BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231. 2013-02-04 14:15:27 +13:00
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 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
SearchForm.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
UploadField_FileEdit.ss ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
UploadField.ss FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 2013-12-19 09:11:31 +00:00