tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,576 Commits 29 Branches 403 Tags 28 MiB
ba9c3378e2
Commit Graph

497 Commits

Author SHA1 Message Date
Daniel Hensby
e9e6a9cca4 Merge pull request #1361 from kinglozzer/behat-coverage-file-link 
Add behat coverage to check that file field is reset when adding links
 2016-01-12 00:37:22 +00:00
Loz Calver
e19dfd628b Add behat coverage to check that file field is reset when adding links 2016-01-11 17:08:28 +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
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13:00
Damian Mooyman
c6c650f136 BUG Ensure CMSMainTest uses correct siteconfig 
BUG Prevent CMSAddPageController invoking Security::LoginForm code during error handling
 2015-11-05 16:47:58 +13:00
Patrick Nelson
75dc391df9 FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint. 2015-10-09 15:36:21 -04:00
Peter Thaleikis
f291c5f365 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-09-28 22:31:31 +13:00
Damian Mooyman
f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
 2015-09-09 14:09:00 +12:00
Damian Mooyman
6c17397322 BUG block adding children from archived pages 
Fixes #1260
 2015-08-24 15:16:09 +12:00
Stephen Shkardoon
b87f5473d9 MINOR Change how OldPageRedirector gets URLs to fix nested redirects 
Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
 2015-08-21 00:29:37 +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
Damian Mooyman
a6677b1653 API respect custom attributes on OptionsetField and CheckboxSetField 
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
 2015-08-03 16:08:56 +12:00
Loz Calver
10b2fdc318 FIX: ContentController::getViewer() not returning all found templates (fixes #1244) 2015-07-24 11:50:09 +01: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
Ingo Schommer
ce85764292 Behat tests hotlinking to non-existant image 
Caused by silverstripe.com redesign. Ideally we'd
have a permanent asset hosted there which is clearly marked as a test dependency.
Or create a placeholder for images linked served localhost within the Behat tests,
in which case we wouldn't require a network connection to execute Behat.
 2015-07-18 15:38:44 +12:00
Damian Mooyman
3b90fef04f BUG fix behat tests 
Fixes #1223
 2015-07-01 13:24:44 +12: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
Nathan Glasl
0de71d45db Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring. 2015-06-22 16:05:13 +10: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
Damian Mooyman
1f9fc33349 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	code/model/SiteTree.php
	code/model/SiteTreeLinkTracking.php
	tests/controller/CMSMainTest.php
 2015-06-02 19:23:48 +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
Ingo Schommer
bb177249ba Merge pull request #1170 from tractorcow/pulls/3.1/cms-test 
BUG Fix CMSMainTest attempting to render page on Security permission error
 2015-04-29 00:12:47 +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
Damian Mooyman
cabd8bbab9 Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting 
FIX: VirtualPages use correct casting for 'virtual' database fields
 2015-03-06 11:29:18 +13:00
Damian Mooyman
6c92a86d2e BUG Fix CMSMainTest attempting to render page on Security permission error 2015-02-24 17:27:48 +13:00
Damian Mooyman
475b6d18e5 Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 17:48:11 +13:00
Stephen McMahon
9d888d5dde BUG: Fixed SearchForm not calling getTemplate() in forTemplate() 2014-12-02 15:13:42 +11:00
Damian Mooyman
638fb46407 Resolve merge regressions 2014-11-19 11:04:20 +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
madmatt
4e5b1966d3 Fix changed pages filter to match SiteTree's 'MODIFIED' label 2014-08-07 16:48:06 +12:00
Damian Mooyman
53dbbb7982 BUG Fix CMSMain::getList to correctly respect filter result 
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
 2014-08-06 15:00:48 +12:00
Damian Mooyman
1c48cb6aae BUG Fix search range for asset filter 2014-08-06 13:26:23 +12:00
Damian Mooyman
42755ebf5b Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347 2014-08-01 12:04:58 +12:00
Stig Lindqvist
482c23f18e NEW Adding CMS sitetree filter to see the current 'live' site 
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
 2014-07-29 13:12:36 +12:00
Stig Lindqvist
3eefd65f7c BUG: Narrowing site tree search to one date shows no pages 
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
 2014-07-24 15:24:03 +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