Commit Graph

14 Commits

Author SHA1 Message Date
Damian Mooyman
6a69134fb0 Merge remote-tracking branch 'origin/3.1' 2014-05-12 11:33:44 +12:00
Damian Mooyman
f9cb8805e1 API Error page support for Security controller errors 2014-05-05 17:13:11 +12:00
Ingo Schommer
32478ab512 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-09-27 19:07:13 +02:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00
Ingo Schommer
c21c9cba0d Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:10:26 +02:00
Will Rossiter
2809b009a1 Merge pull request #186 from silverstripe-rebelalliance/api/translation_priority
Add config fragment for new i18n ordering system
2013-05-25 00:59:08 -07:00
Ingo Schommer
a96dbff3db Explicitly added routes (following removal of auto-routing controllers) 2013-01-29 14:59:54 +01:00
Hamish Friedlander
436899adbf Add config fragment for new i18n ordering system 2012-08-28 17:23:48 +12:00
Hamish Friedlander
2637e6d9b2 FIX Dont refer to framework module in config rules
Might be called sapphire instead, in which case routing rules
will end up in the wrong place
2012-08-28 15:46:33 +12:00
Hamish Friedlander
cbadd3ef9b FIX Config frag legacycmsroutes doesnt need to come after _everything_ 2012-08-28 13:55:49 +12:00
Will Rossiter
c394605507 MINOR: move route to cms module 2012-06-20 16:20:18 +02:00
Ingo Schommer
6ed5ef9648 BUGFIX Redirecting legacy admin/cms URL to new admin/pages (fixes #7409) 2012-06-03 22:45:42 +02:00
Hamish Friedlander
f410ccfa0d BUGFIX: Make Page panel the default again after the recent addition of AdminRootController 2012-05-19 14:43:25 +12:00
Hamish Friedlander
563e0cfc05 BUGFIX: Make CMSes Director rules use new yaml config fragments system 2012-05-19 14:43:10 +12:00