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
..
BasicAuthTest.php	Merge remote-tracking branch 'composer/3.1' into 3	2015-01-15 18:52:46 +13:00
BasicAuthTest.yml	BUG Fix BasicAuth not resetting failed login counts on authentication	2014-10-24 14:19:12 +13:00
GroupCsvBulkLoaderTest_withExisting.csv	ENHANCEMENT Added GroupCsvBulkLoader class to facilitate group imports with permission codes and hierarchy	2009-12-02 09:40:38 +00:00
GroupCsvBulkLoaderTest.csv	ENHANCEMENT Added GroupCsvBulkLoader class to facilitate group imports with permission codes and hierarchy	2009-12-02 09:40:38 +00:00
GroupCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupCsvBulkLoaderTest.yml	ENHANCEMENT Added GroupCsvBulkLoader class to facilitate group imports with permission codes and hierarchy	2009-12-02 09:40:38 +00:00
GroupTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupTest.yml	BUGFIX Nested Group records should be removed, along with the parent.	2012-03-28 22:49:58 +13:00
MemberAuthenticatorTest.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
MemberCsvBulkLoaderTest_cleartextpws.csv	MINOR Added MemberCsvBulkLoaderTest->testCleartextPasswordsAreHashedWithDefaultAlgo()	2010-02-12 00:58:10 +00:00
MemberCsvBulkLoaderTest_withGroups.csv	ENHANCEMENT MemberCsvBulkLoader for easy member import with group associations	2009-12-02 09:40:33 +00:00
MemberCsvBulkLoaderTest.csv	ENHANCEMENT MemberCsvBulkLoader for easy member import with group associations	2009-12-02 09:40:33 +00:00
MemberCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberCsvBulkLoaderTest.yml	ENHANCEMENT MemberCsvBulkLoader for easy member import with group associations	2009-12-02 09:40:33 +00:00
MemberTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberTest.yml	API CHANGE Member->canEdit() returns false if the editing member has lower permissions than the edited member, for example if a member with CMS_ACCESS_SecurityAdmin permissions tries to edit an ADMIN (fixes #5651) (from r110856)	2010-10-19 02:46:26 +00:00
PasswordEncryptorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PasswordValidatorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionCheckboxSetFieldTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionCheckboxSetFieldTest.yml	MINOR Using BlankPage template in SecurityTest, BasicAuthTest to remove ContentController dependency	2011-03-29 18:07:55 +13:00
PermissionRoleTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionRoleTest.yml	FEATURE: added several tests for PermissionCheckboxSetField, PermissionRole and Group (from r94887)	2009-12-16 05:43:59 +00:00
PermissionTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionTest.yml	FIX: ensure that permissions_for_member() accounts for denied permissions.	2012-07-01 17:55:20 +12:00
RandomGeneratorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SecurityDefaultAdminTest.php	Merge remote-tracking branch 'origin/3.1'	2014-11-19 11:16:46 +13:00
SecurityTest.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
SecurityTokenTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00