Ingo Schommer
82f1d980e8
Merge remote-tracking branch 'origin/0.3'
...
Conflicts:
code/SubsiteAdmin.php
code/extensions/LeftAndMainSubsites.php
code/extensions/SiteTreeSubsites.php
code/model/Subsite.php
composer.json
javascript/SubsitesTreeDropdownField.js
lang/en_US.php
tests/SubsiteAdminTest.php
tests/SubsiteTest.php
tests/SubsiteTest.yml
tests/SubsitesVirtualPageTest.php
2013-01-03 21:03:26 +01:00
Ingo Schommer
dfeb52de87
Fix test failures caused by subsite filtering on fixture retrieval
2013-01-03 14:51:04 +01:00
Ingo Schommer
601e8d6c68
Fixed fixture class references
2013-01-03 14:15:41 +01:00
Ingo Schommer
f909aad7b4
API CHANGE Removed Subsite_Template subclass, as it unnecessarily duplicates the Subsite->duplicate() logic in Subsite_Template->createInstance(). It also arbitrarily limits duplication of subsites to templates.
2013-01-03 14:10:08 +01:00
Kirk Mayo
c345f6fcc5
BUG: Coding convention fixes
...
BUG: more coding convention fixing
2012-07-16 11:44:54 +12:00
UndefinedOffset
ef4d539a12
BUG: Merged patch from kmayo how ever re-added some of the removed fields since they really should appear on the Main Content tab instead of the Metadata tab.
...
Fixed a few missed strict errors
Applied patch from kmayo to fix issues with SubsiteAdminTest.php
Fixed issue causing the url segments of subsites created from a template to add -2 to the end
Fixed undefined method TotalItems() on datalist for the SubsiteTest
Fixed failure on SubsiteTest because DataObject::get_one() now returns boolean false instead of null when no result is found
Fixed failure on SubsitesVirtualPageTest caused by Versioned::get_one_by_stage() returning null instead of false
Fixed failure caused by the contact-us page existing on subsite 2
Merged another patch from kmayo
Force main site to be on, for some reason it gets hidden in some cases i.e. refreshing the cms while editing a page
2012-07-16 11:21:54 +12:00
Ingo Schommer
72e1e5b1b2
BUGFIX Overload validateURLSegment() in SubsitesVirtualPage to allow for same URLSegments as linked pages, as long as they only exist in a different subsite (only change the URLSegment if it already exists in the same subsite). (AIR-4)
2011-08-22 17:52:21 +02:00
Ingo Schommer
85a095702b
MINOR Removed dependency on sapphire fixture file
2011-03-29 21:58:45 +13:00
Ingo Schommer
55214b3e24
MINOR Adapted SubsitesVirtualPageTest to changed File API (see r107268)
2010-06-29 06:10:16 +00:00
Geoff Munn
06bb7c7423
BUGFIX: tables and columns quoted properly
2010-04-29 22:58:10 +00:00
Sean Harvey
a9ce309881
MINOR Fixed broken test
2010-03-16 23:22:42 +00:00
Tom Rix
fa21df693f
MINOR pass tests
2010-03-02 01:15:11 +00:00
Tom Rix
3dd9b2a1e4
BUGFIX syntax errors
2010-03-01 22:43:04 +00:00
Tom Rix
ac65b11483
MINOR fixed language (from r94920) (from r96343)
2010-03-01 22:33:28 +00:00
Tom Rix
30f9d15694
MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777) (from r96340)
2010-03-01 22:32:42 +00:00
Tom Rix
12c9705f47
BUGFIX: Fix virtual page logic for subsite virtual pages too. (from r93916) (from r96338)
2010-03-01 22:32:24 +00:00
Tom Rix
d3e666c09a
MINOR: Added test for link rewriting on SubsitesVirtualPages (from r89909) (from r96322)
2010-03-01 22:27:46 +00:00
Tom Rix
93afe6e6ff
MINOR Custom meta tags on SubsiteVirtualPages no longer get overwritten. (from r87329)
2010-03-01 21:49:50 +00:00
Tom Rix
99a788a0dc
MINOR: Removed debug statement from test (from r96641) (from r96650)
2010-03-01 21:42:25 +00:00
Tom Rix
bd649d170d
MINOR fixed language (from r94920)
2010-03-01 21:42:05 +00:00
Tom Rix
bdf07e05c0
MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777)
2010-03-01 21:41:24 +00:00
Tom Rix
4d90cfeeb3
BUGFIX: Fix virtual page logic for subsite virtual pages too. (from r93916)
2010-03-01 21:41:06 +00:00
Tom Rix
f7abf23ac7
MINOR: Added test for link rewriting on SubsitesVirtualPages (from r89909)
2010-03-01 21:38:59 +00:00
Tom Rix
3171075cd5
MINOR unit tests (from r83592)
2010-03-01 02:58:13 +00:00
Tom Rix
53d51e40ba
2010-03-01 02:56:19 +00:00
