silverstripe-framework/security
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
..
Authenticator.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
BasicAuth.php Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule 2014-12-05 11:35:52 +13:00
ChangePasswordForm.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSMemberLoginForm.php API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13:00
CMSSecurity.php Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
Group.php Removing deprecated class/functions marked for deprecation in 3.0/3.1 2014-08-25 12:06:05 +12:00
GroupCsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LoginAttempt.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LoginForm.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
Member.php Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
MemberAuthenticator.php Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
MemberCsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MemberLoginForm.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
MemberPassword.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PasswordEncryptor.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PasswordValidator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Permission.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionCheckboxSetField.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionFailureException.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionProvider.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
PermissionRole.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionRoleCode.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RandomGenerator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Security.php Merge remote-tracking branch 'origin/3.1' 2014-11-19 11:16:46 +13:00
SecurityToken.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00