Will Rossiter
3f902eb9fc
Merge pull request #1093 from dhensby/patch-1
...
Implement `TemplateGlobalProvider` on `SiteConfig`
2014-08-23 09:24:26 +12:00
Daniel Hensby
89184a8134
Implement TemplateGlobalProvider on SiteConfig
...
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
2014-08-22 14:28:19 +01:00
Damian Mooyman
fa90658b7c
Merge pull request #1090 from halkyon/travis_reformat
...
Reformat .travis.yml
2014-08-22 15:46:11 +12:00
Sean Harvey
4d0e4b78f4
Reformat .travis.yml
2014-08-22 14:04:50 +12:00
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
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
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
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
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
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
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
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
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
Hamish Friedlander
435a5ee843
Merge pull request #1007 from tractorcow/pulls/3.1-security-errorpage
...
API Error page support for Security controller errors
2014-05-06 11:44:22 +12:00
Damian Mooyman
f9cb8805e1
API Error page support for Security controller errors
2014-05-05 17:13:11 +12:00
Hamish Friedlander
1f4d9e449b
Merge pull request #1010 from tractorcow/pulls/3.1-travis
...
Update travis configuration to use composer phpunit
2014-05-05 14:43:45 +12:00
Damian Mooyman
b5214d25a1
Update travis configuration to use composer phpunit
...
Made PHP 5.6 an allowed failure
2014-05-05 13:14:57 +12:00
Ingo Schommer
36bb411277
Merge pull request #1011 from tractorcow/pulls/3.1-behat-fixes
...
BUG Behat now uses explicit radio button behaviour
2014-05-05 13:10:25 +12:00
Damian Mooyman
c5d5d10094
BUG Behat now uses explicit radio button behaviour
2014-05-05 12:46:57 +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
341eeb7c31
Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
...
FIX: Broken file link tracking (fixes #996 )
2014-04-29 09:36:36 +12:00
Damian Mooyman
89fbae2c2e
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 08:54:17 +12:00
Ingo Schommer
9bff36c078
Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
...
API Filter by date created for files
2014-04-28 23:40:17 +12:00
Ingo Schommer
66919ed0cc
Merge pull request #1003 from tractorcow/pulls/3.1-configurable-paging
...
API Ability to configure paging for assets / pages
2014-04-28 23:06:47 +12:00
