Damian Mooyman f13e44a265 Merge 3 into master ... # Conflicts: # admin/javascript/LeftAndMain.Tree.js # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/en.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # css/GridField.css # forms/gridfield/GridFieldExportButton.php # javascript/GridField.js # javascript/lang/ar.js # javascript/lang/cs.js # javascript/lang/de.js # javascript/lang/en.js # javascript/lang/en_GB.js # javascript/lang/eo.js # javascript/lang/es.js # javascript/lang/fi.js # javascript/lang/fr.js # javascript/lang/id.js # javascript/lang/id_ID.js # javascript/lang/it.js # javascript/lang/ja.js # javascript/lang/lt.js # javascript/lang/mi.js # javascript/lang/nb.js # javascript/lang/nl.js # javascript/lang/pl.js # javascript/lang/ru.js # javascript/lang/sk.js # javascript/lang/sl.js # javascript/lang/sr.js # javascript/lang/sr@latin.js # javascript/lang/sr_RS.js # javascript/lang/sr_RS@latin.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # javascript/lang/sv.js # javascript/lang/zh.js # scss/GridField.scss # tests/model/ManyManyListTest.php # tests/model/SQLQueryTest.php		2016-05-11 15:19:35 +12:00
..
BasicAuthTest.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:48:07 +12:00
BasicAuthTest.yml	BUG Fix BasicAuth not resetting failed login counts on authentication	2014-10-24 14:19:12 +13:00
GroupCsvBulkLoaderTest_withExisting.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupCsvBulkLoaderTest.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupCsvBulkLoaderTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GroupTest.php	BUG Guard against users being added to all groups on unsaved Group.	2015-12-11 14:51:51 +13: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 3.3 into 3	2016-05-11 14:06:23 +12:00
MemberCsvBulkLoaderTest_cleartextpws.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest_withGroups.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest.csv	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberCsvBulkLoaderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
MemberCsvBulkLoaderTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
MemberTest.yml	Merge 3.3 into 3	2016-04-26 00:24:59 +01: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	Replace core uses of DataObject::has_one/has_many/many_many	2015-03-13 16:16:12 +00:00
PermissionCheckboxSetFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
PermissionRoleTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
PermissionRoleTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
PermissionTest.php	Merge remote-tracking branch 'origin/3.3' into 3	2016-01-19 17:08:26 +13:00
PermissionTest.yml	FIX Members can access their own profiles in CMS	2015-08-26 15:47:51 +01:00
RandomGeneratorTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
SecurityDefaultAdminTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
SecurityTest.php	Fix merge regressions	2016-05-02 09:08:37 +12:00
SecurityTokenTest.php	API Add CSRF to Campaign delete	2016-05-09 17:33:10 +12:00