Daniel Hensby
c8976a9d64
Merge branch '3.1' into 3.2
2016-06-13 14:33:35 +01:00
Daniel Hensby
d6a57eb507
Amending redundant test
2016-06-04 23:03:06 +01:00
Daniel Hensby
9d62d9d381
FIX Link tracking not escaping #
Fixes #1409
2016-03-21 15:22:00 +00:00
Loz Calver
d637141487
FIX: preg_quote() anchors in SiteTreeLinkTracking ( fixes #1359 )
2016-01-11 16:44:55 +00:00
Loz Calver
2983d823d1
FIX: Ensure VirtualPage forwards request/response data to virtual controllers ( fixes #1329 )
2015-11-18 09:14:11 +00:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12:00
Daniel Hensby
f55b22bd75
Merge branch '3.1' into 3.2
...
Conflicts:
CONTRIBUTING.md
code/reports/BrokenLinksReport.php
code/reports/SideReport.php
tests/model/RedirectorPageTest.php
tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Loz Calver
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01:00
Damian Mooyman
d5c7bf66a2
Fix test regressions
2015-06-19 10:47:19 +12:00
Daniel Hensby
715cd9ab4e
Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation
...
Conflicts:
tests/model/SiteTreeTest.php
2015-06-13 15:23:22 +01:00
Stevie Mayhew
a819bcfc97
FIX: explicitly call get functions for site tree checks
2015-06-05 11:09:23 +12:00
Damian Mooyman
b169823a00
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Ingo Schommer
36ac61115a
Fix auto-setting of URL from localized page titles
...
Replace the hardcoded check for english locale ("new-page")
with a localized version.
See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Damian Mooyman
cf4d9edafb
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteConfig.php
javascript/CMSMain.AddForm.js
tests/model/SiteConfigTest.php
tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Loz Calver
a142ffd465
FIX: VirtualPages use correct casting for 'virtual' database fields
2014-11-17 15:44:17 +00:00
Mateusz Uzdowski
2ba1c46bc8
API Change broken link hihglighting to write to database.
...
Before it would be applied on the fly during the rendering of the
HtmlEditorField, and only be written to the database during the
subsequent write.
We just shift the behaviour to apply just-in-time.
2014-08-15 12:29:26 +12:00
Mateusz Uzdowski
b41e081130
Refactor the link-tracking code and move it from framework.
...
This code has a dependency on SiteTree, so it fits much better in the
cms module.
Abstracted away the content parser so the same code can be reused both
in the render phase (to highlight the links) and in the write phase
(storing information about broken links and references).
2014-08-14 11:16:49 +12:00
Mateusz Uzdowski
52d297e6ef
Merge remote-tracking branch 'origin/3.1' into merge-back
...
Conflicts:
code/controllers/CMSSiteTreeFilter.php
code/controllers/ReportAdmin.php
code/reports/Report.php
2014-08-13 17:19:01 +12:00
Will Rossiter
18d6c538a7
API: Extract siteconfig out to an external module.
2014-08-09 17:29:50 +12:00
Damian Mooyman
a395c5322f
API Move of codebase to parameterised query database abstraction layer
...
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
2014-07-07 15:07:37 +12:00
Rodney Way
1e194854e0
BUG: Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy.
...
Also updated SiteTree YML test data to match.
2014-06-24 13:29:16 +10:00
Damian Mooyman
1a85c7a1ec
Merge pull request #1022 from silverstripe-iterators/pulls/redirector-proto-relative
...
Pulls/redirector proto relative
2014-06-13 16:01:20 +12:00
Damian Mooyman
cba0061fe2
Merge pull request #974 from micmania1/930-added-breadcrumbs-getter
...
API Added getBreadcrumbItems to SiteTree
2014-06-03 08:43:53 +12:00
Ingo Schommer
40f7a876d4
Support for protocol relative RedirectorPage.ExternalURL
2014-05-30 00:01:45 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
micmania1
f46b6bde51
Added getBreadcrumbItems to SiteTree
2014-05-08 03:21:40 +01:00
Damian Mooyman
b3699281c0
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman
f9cb8805e1
API Error page support for Security controller errors
2014-05-05 17:13:11 +12:00
Mateusz U
fcb6a9140c
Merge pull request #1004 from tractorcow/pulls/sitetree-title
...
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 14:37:29 +12:00
Damian Mooyman
89fbae2c2e
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 08:54:17 +12:00
Loz Calver
396fd9a86e
FIX: Broken file link tracking ( fixes #996 )
2014-04-28 09:26:34 +01:00
Damian Mooyman
61ebe08437
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:10:49 +12:00
Damian Mooyman
3204ab5af3
BUG Fix orphaned pages reporting they can be viewed
2014-04-07 12:52:07 +12:00
Simon Welsh
b497b8f548
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/reports/Report.php
2014-03-18 09:23:39 +13:00
Simon Welsh
2503d1dca2
Merge pull request #911 from chillu/pulls/908-all-sections-canedit
...
Page edit access with CMS_ACCESS_LeftAndMain (fixes #908 )
2014-03-16 20:12:15 +13:00
Ingo Schommer
172a1816f9
Merge remote-tracking branch 'origin/3.1'
2014-02-04 07:56:10 +13:00
Russell Michell
7d7c75414c
NEW Track broken anchors
2014-01-31 12:44:59 +13:00
Mateusz U
b52002724e
Merge pull request #926 from halkyon/virtualpage_extensions_fix
...
Fixing test failures introduced by Translatable and SiteTreeSubsites
2014-01-16 14:16:25 -08:00
Sean Harvey
93dca704fb
Fixing test failures introduced by Translatable and SiteTreeSubsites
...
Same fix as e93abc6
, except it applies to VirtualPageTest.
2014-01-17 10:36:00 +13:00
Sean Harvey
e93abc6eb2
Fixing test failures because of Translatable and SiteTreeSubsites
2014-01-16 11:36:25 +13:00
Ingo Schommer
1f17f4320d
Page edit access with CMS_ACCESS_LeftAndMain ( fixes #908 )
...
"Access to all sections" implies edit access in the CMS
2013-12-13 10:05:06 +01:00
Ingo Schommer
87734cdfe1
Fixed ErrorPageTest Link() usage
2013-12-06 15:35:53 +01:00
Will Rossiter
ddc2e3822b
FIX: ErrorPage generating empty responses for 403/401 requests
...
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular
I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
2013-11-18 16:32:15 +13:00
Andrew Short
1f4cdfced8
Fix test sometimes using cached relationship object.
...
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
2013-10-02 15:03:50 +10:00