Commit Graph

2952 Commits

Author SHA1 Message Date
ajshort
57f47af6c0 Merge remote-tracking branch 'upstream/master' 2011-04-26 11:07:11 +10:00
Ingo Schommer
2039aaeb26 Merge branch 'master' of github.com:silverstripe/silverstripe-cms 2011-04-24 11:43:25 +12:00
Brian Waters
c9b5ae8b41 API CHANGE: Added SiteTree::get_create_default_pages().MINOR: Error pages no longer created on /dev/build if SiteTree::get_create_default_pages() is false. Fixes #6587. 2011-04-23 17:52:53 +12:00
ajshort
6462c59f0f API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.
MINOR: Replaced references to decorators with extensions.
2011-04-15 19:37:15 +10:00
Ingo Schommer
470a2841a3 MINOR Removed redundant allowedParents information from siteTreeHints, already contained in allowedChildren 2011-04-07 21:57:57 +12:00
Ingo Schommer
446b8bae63 MINOR Fixed SiteTreeTest->testCompareVersions() to work regardless of used HTMLCleaner implementation (was failing if lib_tidy wasn't available) 2011-04-06 22:16:46 +12:00
Ingo Schommer
842c38fbc4 MINOR Disable ui-titlebar styling for link/image forms, as it breaks the "insert" button interactions (to be replaced with a new modal dialog implementation soon anyway) 2011-04-05 15:34:59 +12:00
Ingo Schommer
f547da23a3 MINOR Relative $fixture_file links in cms/tests to facilitate moving files 2011-03-30 20:04:31 +13:00
Ingo Schommer
60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00
Ingo Schommer
aef17ed2e0 MINOR Fixed SiteTreeTest->testCompareVersions() to work with new Diff/HTMLCleaner implementation 2011-03-30 18:20:38 +13:00
Ingo Schommer
fb4efaa17e MINOR Moving HTMLCleaner interface to sapphire (related to Diff class) 2011-03-30 16:24:32 +13:00
Ingo Schommer
8e6a38559e MINOR Override CMSMain->CMSVersion() to check for cms/silverstripe_version 2011-03-29 21:35:00 +13:00
Ingo Schommer
593754b12c Merge branch 'cms-separation' 2011-03-29 18:29:00 +13:00
Ingo Schommer
7d9904d1f1 MINOR Moved Translatable::choose_site_locale() from LeftAndMain to CMSMain, its not necessary in other core controllers (other than specifically customized ModelAdmin instances) 2011-03-29 18:00:21 +13:00
Ingo Schommer
466add9bb2 API CHANGE Removed CMSBatchAction->getDoingText(), couples behaviour with view too tightly, and was replaced by graphical loading indication in CMS UI a while ago 2011-03-28 15:13:50 +13:00
Ingo Schommer
c2457c845b MINOR Moved jquery-changetracker from 'cms' to 'sapphire' 2011-03-28 09:17:58 +13:00
Ingo Schommer
89055eeb2e API CHANGE: Moved ManifestBuilder::get_themes() to SSViewer::get_themes(). (copied from 5c972b231d00117ca0cf4a32d08b59ed760256c6) 2011-03-28 09:03:07 +13:00
Ingo Schommer
4c52504727 MINOR: Replaced deprecated ClassInfo::is_subclass_of() calls. (copied from 969aa0b51e7418d17150653ccf37fe9815b74d45) 2011-03-28 09:03:07 +13:00
Ingo Schommer
9505be1e78 BUGFIX Using SiteTree->MenuTitle in SiteTree->getCMSFields() parent page tree field, to stay consistent with CMS tree (fixes #6268) (copied from 2449a2b5c639384de75a55ef752e2efba8c513f3) 2011-03-28 09:03:07 +13:00
Ingo Schommer
3380bc6457 MINOR Removed unnecessary SiteTree->Status setting in ContentController, ErrorPage and SiteTree - now controlled via getters like isPublished() (copied from efe710e2d30c6cff8599a76de2b24f315b53a088) 2011-03-28 09:03:06 +13:00
Ingo Schommer
0bcb57dfb5 MINOR Fixed merge errors (copied from 31d7a00eb785b9a570b33994dfdec82b930db236) 2011-03-28 09:03:06 +13:00
Ingo Schommer
5da903e85f MINOR Moved LeftAndMain->EditorToolbar() to CMSMain, as its only relevant here 2011-03-28 09:03:06 +13:00
Ingo Schommer
919c85d413 MINOR Moved CMSBatchAction class to sapphire module, but keeping SiteTree specific subclasses in cms 2011-03-28 09:03:06 +13:00
Ingo Schommer
885651c76e MINOR Removed unused images from cms/images 2011-03-28 09:03:00 +13:00
Ingo Schommer
5b0db7fdae MINOR Added necessary requirements paths to CMSMain after moving files to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
f1e1cbe09b MINOR Fixed test fixture paths and @package from 'sapphire' to 'cms' 2011-03-28 09:02:43 +13:00
Ingo Schommer
426f7e734f API CHANGE Moved SiteTree->doRollbackTo() to Versioned class 2011-03-28 09:02:43 +13:00
Ingo Schommer
81881e1379 MINOR Added SitetreeHTMLEditorFieldTest to test HtmlEditorField functionality specific to SiteTree and link tracking 2011-03-28 09:02:42 +13:00
Ingo Schommer
317ca6f96a MINOR Added SiteTreeFolderDecorator and FolderUnusedAssetsField (moved functionality from Folder class in 'sapphire' module) 2011-03-28 09:02:42 +13:00
Ingo Schommer
dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
7b038db3be MINOR Moved FileLinkTracking feature into new SiteTreeFileDecorator class in order to move it from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
0b5e9ba132 MINOR Moved CurrentPageIdentifier from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
f407c18796 MINOR Fixed paths for SilverStripeNavigator resources (from sapphire/ to cms/) 2011-03-28 09:02:42 +13:00
Ingo Schommer
c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
16d818c201 MINOR Added ModelAsController director rule from 'sapphire' module to cms/_config.php 2011-03-28 09:02:42 +13:00
Ingo Schommer
8c04bafb4e MINOR Added class_exists() check for Translatable, which has moved into a new 'translatable' module 2011-03-28 09:02:41 +13:00
Ingo Schommer
6bd9c56100 Moved ContentControllerSearchExtensionTest and SearchFormTest from sapphire/tests/search into "cms" module 2011-03-28 09:02:20 +13:00
Paul Meyrick
ed36c62291 Minor moved default setting of ShortcodeParser::get from sapphire module _config to cms module _config 2011-03-28 09:02:20 +13:00
Paul Meyrick
dc6ecbd8e8 Minor Moved SiteTreeTest.yml from sapphire/tests to cms module cms/tests 2011-03-28 09:02:20 +13:00
Paul Meyrick
62de2da9e5 Minor Moved MigrateSiteTreeLinkingTask, RemoveOrphanedPagesTask, UpgradeSiteTreePermissionSchemaTask from /sapphire/tasks/ to cms module /cms/tasks/ 2011-03-28 09:02:20 +13:00
Paul Meyrick
5de4f696f3 Minor Moved ErrorPageTest from sapphire/tests/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
69571d5763 Minor Moved VirtualPageTest from sapphire/tests/model/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
d4af221e0a Minor Moved from RedirectorPageTest, SiteTreeActionsTest, SiteTreeBackLinksTest, SiteTreePermissionsTest, SiteTreeTest, WidgetAreaTest /Sites/cgps/sapphire/tests to cms module cms/tests/ 2011-03-28 09:02:19 +13:00
Paul Meyrick
e280929b29 Minor Moved from /sapphire/tests/control/ to cms module cms/tests 2011-03-28 09:02:19 +13:00
Paul Meyrick
766e652ca0 Minor Moved ContentControllerSearchExtension from sapphire/search/ to cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
93bf3029c3 Minor Moved ContentController template from sapphire/templates/ to cms/template in cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
d3c5a309bf Minor Moved ErrorPage, RedirectorPage, SiteConfig, SiteTree, SiteTreeDecorator, VirtualPage from sapphire/core/model/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
9b4f3aaf81 Minor Moved ContentController, ModelAsController, RootURLController, NestedController from sapphire/core/control/ to cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
c905bcb471 MINOR Moved AdvancedSearchForm, SearchForm from sapphire/search to cms module 2011-03-28 09:02:19 +13:00