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
..
BackLink_Button.ss	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-08-07 17:14:47 +02:00
CMSLoadingScreen.ss	Translations: Switch to Transifex format	2013-08-07 00:25:16 +02:00
CMSProfileController_EditForm.ss	admin/myprofile layout after validation (fixes #2644)	2013-11-07 16:19:40 +01:00
CMSSectionIcon.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
CMSSettingsController_SilverStripeNavigator.ss	ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.	2012-10-05 16:30:47 +13:00
Editor_toolbar.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
LeftAndMain_Content.ss	UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts	2012-05-30 15:07:13 +02:00
LeftAndMain_EditForm.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
LeftAndMain_Menu.ss	added logout url to Security and deprecated Security::set_login_url in favour of config	2013-12-20 21:55:54 +00:00
LeftAndMain_SilverStripeNavigator.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
ModelAdmin_Content.ss	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12:00
ModelAdmin_EditForm.ss	MINOR Removing executable flag from all files (thanks miiihi)	2011-09-18 22:04:02 +02:00
ModelAdmin_ImportSpec.ss	Fixed merge error (mainly new translation entity format in templates)	2013-08-09 15:27:28 +02:00
ModelAdmin_Tools.ss	Remove "Filter" title if no search form is present	2015-01-07 16:22:12 +13:00