silverstripe-reports/code
Ingo Schommer 57d7655f80 Merge pull request #91 from silverstripe-big-o/silverstripe-cms
---

...the designs.

Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
2012-04-11 16:17:51 +02:00
..
batchactions MINOR Fixed method signature on batch actions 2011-10-04 13:24:01 +02:00
controllers Merge pull request #91 from silverstripe-big-o/silverstripe-cms 2012-04-11 16:17:51 +02:00
forms MINOR: Fix E_STRICT warnings 2012-04-11 18:09:11 +12:00
model Merge pull request #90 from halkyon/redirectorpage_changes 2012-04-11 04:10:01 -07:00
reports MINOR Fixing ereg functions with preg in SideReport and Widget 2012-04-10 22:16:17 +12:00
search API CHANGE Removed AdvancedSearchForm, extend SearchForm for custom advanced search functionality instead. 2012-04-10 22:35:15 +12:00
staticpublisher MINOR Remove use of deprecated ereg_replace() and use preg_replace() instead. 2012-03-27 22:52:33 +13:00
widgets MINOR: Fix E_STRICT warnings 2012-04-11 18:09:11 +12:00