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,523 Commits 29 Branches 403 Tags 28 MiB
b26b6c3eca
Commit Graph

4523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Harvey
796874dae7 Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting 
BUG Fix sorting on main ReportAdmin grid
 2014-08-13 10:52:51 +12:00
Damian Mooyman
fc6f0fecc5 Set minimum firefox version for travis support 2014-08-11 18:26:15 +12:00
Simon Welsh
ae8911d7ae Merge pull request #1074 from wilr/modularizesiteconfig 
API: Extract siteconfig out to an external module.
 2014-08-09 15:44:55 +10:00
Will Rossiter
18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Damian Mooyman
87146eac92 Merge pull request #1073 from sunnysideup/patch-8 
fix spelling of pages from pags to pages
 2014-08-08 08:58:27 +12:00
Nicolaas
7eeb59a52f fix spelling of pages from pags to pages 
fix spelling of pages from pags to pages
 2014-08-07 20:33:19 +12:00
Damian Mooyman
0884151f6a Merge pull request #1072 from madmatt/pulls/changed-pages 
Fix changed pages filter to match SiteTree's 'MODIFIED' label
 2014-08-07 17:10:59 +12:00
madmatt
4e5b1966d3 Fix changed pages filter to match SiteTree's 'MODIFIED' label 2014-08-07 16:48:06 +12:00
Sean Harvey
3a5c5efc7c Merge pull request #1069 from tractorcow/pulls/3.1/fix-cmsmain-getlist 
BUG Fix CMSMain::getList to correctly respect filter result
 2014-08-07 13:43:42 +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
Mateusz U
84fcf02f79 Merge pull request #1071 from tractorcow/pulls/3.1/fix-asset-search 
BUG Fix search range for asset filter
 2014-08-06 14:47:29 +12:00
Damian Mooyman
1c48cb6aae BUG Fix search range for asset filter 2014-08-06 13:26:23 +12:00
Damian Mooyman
407033b076 Update translations 2014-08-05 15:01:52 +12:00
Damian Mooyman
acf376e267 Merge pull request #1068 from jakxnz/1067-cmsfieldaddcontroller-geteditform 
#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()
 2014-08-05 08:39:06 +12:00
Mateusz U
3e1904acd8 Merge pull request #1070 from tractorcow/pulls/3.1/framework-3347-test 
Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347
 2014-08-01 13:21:51 +12:00
Damian Mooyman
42755ebf5b Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347 2014-08-01 12:04:58 +12:00
Jakx.nz
20df063f43 #1067 No updateEditForm hook on CMSFieldAddController::getEditForm() 2014-08-01 10:37:11 +12:00
Damian Mooyman
1b0add3ecf Merge pull request #1063 from stojg/pull/published-pages-cmsfilter 
NEW Adding CMS sitetree filter to see the current 'live' site
 2014-07-29 14:56:26 +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
Ingo Schommer
d140fa0b5e Merge pull request #311 from tractorcow/3.2-pdo-connector 
API New Parameterised Database ORM for Silverstripe 3.2. Ticket #7429
 2014-07-28 08:46:16 +12:00
Damian Mooyman
4967d3dbf6 Merge pull request #1056 from stojg/issue/cms-1049 
BUG: Delete parent page, child pages cannot be found anymore
 2014-07-25 17:26:52 +12:00
Stig Lindqvist
45046f08e8 Bug: CMS tree filters doesn't count the correct number of children for deleted pages 
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.

This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.

The solution involves a couple of smaller fixes in both CMS and framework modules.

1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
 2014-07-25 16:18:54 +12:00
Simon Welsh
6a0366fb84 Merge pull request #1060 from stojg/pull/search-for-date 
BUG: Narrowing site tree search to one date shows no pages
 2014-07-24 13:32:31 +10: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
Stig Lindqvist
5107b08ac1 Merge pull request #1039 from dnadesign/fixpopcurrentwarning 
FIX ensure controller stack is updated when execution halted by an exception
 2014-07-21 16:10:05 +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
Will Rossiter
a777266e43 FIX ensure controller stack is updated when execution halted by an exception. 
See: https://github.com/silverstripe/silverstripe-framework/issues/2467

popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.

This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
 2014-07-01 14:18:53 +12:00
Damian Mooyman
a1286f1c0f Merge pull request #1027 from rodneyway/1026-SiteTree-page-delete-omits-children-with-ShowInMenus-off 
Ensure that all child pages are deleted (regardless of their ShowInMenu ...
 2014-06-24 19:41:39 +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
Ingo Schommer
c45fb5af43 Merge pull request #1034 from tractorcow/pulls/3.2/fix-upload-behat 
Pulls/3.2/fix upload behat
 2014-06-18 10:02:53 +12:00
Damian Mooyman
4ed41d6941 Fix tests covering old upload field behaviour 2014-06-18 09:14:47 +12:00
Damian Mooyman
519b0dfaa0 Merge remote-tracking branch 'origin/3.1' 2014-06-17 18:18:21 +12:00
Ingo Schommer
601efbc088 Merge pull request #1023 from tractorcow/pulls/3.1/mink-update 
BUG Fix deleted pages redirecting the CMS
 2014-06-17 11:15:33 +12:00
Damian Mooyman
b8d19ba495 BUG Fix deleted pages redirecting the CMS 
Update behat tests for Mink 1.6 compatibility
 2014-06-17 10:36:08 +12:00
Ingo Schommer
6ac4324eb3 Merge remote-tracking branch 'origin/3.1' 2014-06-16 08:45:30 +12:00
Ingo Schommer
e1f82aba49 Removed goutte driver from Behat, not supported 
Was added way back with the original behat.yml, and then forgotten about
 2014-06-16 08:39:54 +12:00
Ingo Schommer
0b296b3665 Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:35 +12:00
Stig Lindqvist
30d42e06d6 Merge pull request #1013 from tractorcow/pulls/3.2-fix-fulltext-query-encoding 
BUG Fix encoding of SearchForm::getSearchQuery
 2014-06-14 17:15:40 +12: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
88abf5d93e Merge pull request #1029 from rodneyway/1028-SiteTree-filtered-view-not-applied-to-subtree-branches 
1028 - BUG FIX: SiteTree filtered view not applied to subtree branches
 2014-06-11 08:53:08 +12:00
Rodney Way
e5579511d4 Ensure ajax call includes query parameters so that SitreeFilters function as expected. Required for subtree branch loading. 2014-06-10 15:01:12 +10: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
7277dc1600 BUG Fix sorting on main ReportAdmin grid 
ref: CWPBUG-133
 2014-05-15 14:49:41 +12:00
Damian Mooyman
3033d45498 Updated translation masters 2014-05-13 11:13:44 +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
bae95805dd Updated translation masters 2014-05-07 10:03:15 +12:00
Hamish Friedlander
f2c2ffabbc Merge pull request #1006 from tractorcow/pulls/3.1-http-error-codes 
API Update ErrorPage to respect new HTTP Error codes
 2014-05-06 16:22:55 +12:00
Damian Mooyman
3162d0e664 API Update ErrorPage to respect new HTTP Error codes 2014-05-06 15:29:33 +12:00