silverstripe-framework/admin/code
Damian Mooyman 4f06a43986 Merge 3.3 into 3
# Conflicts:
#	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
#	javascript/lang/fr.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
#	lang/it.yml
2016-05-11 14:06:23 +12:00
..
AdminRootController.php FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
CMSBatchAction.php API Deprecate delete in favour of archive 2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
CMSForm.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSMenu.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
CMSMenuItem.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSPreviewable.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSProfileController.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-09 14:35:29 +12:00
GroupImportForm.php Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
LeftAndMain.php Merge 3.3 into 3 2016-05-11 14:06:23 +12:00
LeftAndMainExtension.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MemberImportForm.php Added 3.1.14 changelog 2015-09-15 10:58:15 +12:00
ModelAdmin.php Do not hang on nested parameters in search context 2016-03-21 15:54:22 +13:00
SecurityAdmin.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00