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,341 Commits 29 Branches 403 Tags 28 MiB
519b0dfaa0
Commit Graph

4341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
5dd058338a BUG Fix encoding of SearchForm::getSearchQuery 
This made it awkward for user code to extract the query value for use in other applications; This would otherwise have to be xml decoded again.
Casting has been promoted to the templating level via DBField::create_field and a `SearchForm.casting` config setting.
 2014-05-06 11:11:46 +12: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
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
Loz Calver
396fd9a86e FIX: Broken file link tracking (fixes #996) 2014-04-28 09:26:34 +01:00
Mateusz U
072e0d9805 Merge pull request #992 from tractorcow/pulls/966-fix-searchfilters 
BUG Fix issue with page search ignoring filters
 2014-04-28 15:28:53 +12:00
Damian Mooyman
0285322049 API Ability to configure paging for assets / pages 
ref: CWPBUG-143
 2014-04-28 15:22:17 +12:00
Russell Michell
a502c9d21c NEW Fixes #966. Ability to filter pages on page status. 
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
 2014-04-28 14:50:07 +12:00
Damian Mooyman
61ebe08437 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:10:49 +12:00
Damian Mooyman
3765030faa API Filter by date created for files 
Added test cases
Do not merge before https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/32

ref: CWPBUG-144
 2014-04-15 09:42:53 +12:00
Damian Mooyman
baff7f12bd Merge pull request #968 from phptek/issue/965 
FIX Fixes #965. Allow user date-settings to show on GridField Page admin
 2014-04-10 14:21:08 +12:00
Will Rossiter
f40de3b1a7 Merge pull request #991 from tractorcow/pulls/3.1-canview-orphaned 
BUG Fix orphaned pages reporting they can be viewed
 2014-04-07 09:02:06 -07:00
Damian Mooyman
3204ab5af3 BUG Fix orphaned pages reporting they can be viewed 2014-04-07 12:52:07 +12:00
Damian Mooyman
ecda66a1c4 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:39:47 +13:00
Damian Mooyman
7adbf81c74 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	code/model/SiteTree.php
	tests/controller/CMSMainTest.php
 2014-04-01 08:36:16 +13:00
Ingo Schommer
4d48c48aa8 Merge pull request #986 from tractorcow/pulls/translation-update 
Updated translation master
 2014-03-31 16:25:12 +13:00
Damian Mooyman
755f4f1557 Updated translation master 2014-03-31 14:23:47 +13:00
Damian Mooyman
ab78198946 Merge pull request #979 from ss23/SS2014005-3-1 
FIX Do now allow arbitary class creation in CMS
 2014-03-27 12:55:40 +13:00
Damian Mooyman
28043317bb Merge pull request #978 from ss23/SS2014005-3-0 
FIX Do now allow arbitary class creation in CMS
 2014-03-27 12:25:18 +13:00
Stephen Shkardoon
bf9b22fd43 FIX Do now allow arbitary class creation in CMS 2014-03-27 11:37:45 +13:00
Damian Mooyman
17b3e3e99f Merge pull request #977 from ss23/SS2014004-3-1 
FIX Prevent SQLi when no URL filters are applied
 2014-03-27 11:27:23 +13:00
Damian Mooyman
43d308cd1b Merge pull request #976 from ss23/SS2014004-3-0 
FIX Prevent SQLi when no URL filters are applied
 2014-03-27 11:23:20 +13:00
Ingo Schommer
8059c9d357 Merge pull request #975 from tractorcow/pulls/3.2-fix-controller-tests 
BUG Fix ContentControllerTest
 2014-03-25 22:38:24 +13:00