Commit Graph

4689 Commits

Author SHA1 Message Date
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
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
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
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
Stephen Shkardoon
a67ed2799d FIX Do now allow arbitary class creation in CMS 2014-03-19 19:27:39 +13:00
Stephen Shkardoon
114df8a3a5 FIX Prevent SQLi when no URL filters are applied 2014-03-19 19:09:58 +13:00
Stephen Shkardoon
8e50405871 FIX Prevent SQLi when no URL filters are applied 2014-03-19 19:05:13 +13:00
Simon Welsh
7002dcfa7f Assets table just shows the name, not the path 2014-03-18 08:56:41 +13:00
Russell Michell
b4a1aa4537 FIX Fixes #965. Allow user date-settings to show on GridField Page admin
- Relies on framework PR #2961.
2014-03-17 10:40:08 +13:00
Simon Welsh
403b47fe6c Merge pull request #951 from sheadawson/950-fileexists
FIX fileexists check
2014-03-16 20:29:12 +13:00
Simon Welsh
7f62cd3c88 Merge pull request #946 from srizzling/adminasset-filter
Adding AdminAssets filter Behat tests
2014-03-16 20:26:24 +13:00
Simon Welsh
f90f52f967 Merge pull request #921 from madmatt/pulls/behat-insert-links
Fix behat tests for insert-a-link.feature
2014-03-16 20:19:58 +13:00
Simon Welsh
de12aeb627 Merge pull request #920 from madmatt/pulls/behat-image-uploads
Fix behat tests for insert-an-image.feature
2014-03-16 20:19:42 +13:00
Simon Welsh
ebbb35d04f Merge pull request #919 from madmatt/pulls/behat-insert-image
Fix “I can insert an image from the CMS file store”.
2014-03-16 20:19:26 +13:00
Simon Welsh
5d18d49a8e Merge pull request #917 from kinglozzer/savebutton-changetracker-issue
FIX: Changetracker causing 'saveButton is not a function' error
2014-03-16 20:18:28 +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
Simon Welsh
5024a48f89 FIX: Reports with Parameter fields override ReportTitle and ReportDescription
Fixes #696
2014-03-16 19:09:47 +13:00
Simon Welsh
79da34ff6e Add PHP 5.6 to the test matrix 2014-03-13 21:00:10 +13:00
Ingo Schommer
dee64bbb2d Fixed behat image upload tests (contd.) 2014-03-13 13:39:59 +13:00
Ingo Schommer
20605f7be0 Fixed behat image upload tests
Was using "File" class rather than "Image",
which broke HtmlEditorField->saveInto() with "unknown method getWidth()"
2014-03-13 13:35:41 +13:00
Will Rossiter
193a2ab31c Merge pull request #5 from stevie-mayhew/bugfix/reportadmin-params
BUGFIX: pass the correct param values through to reports
2014-03-13 11:43:23 +13:00
Stevie Mayhew
f1024db69e BUGFIX: pass the correct param values through to reports (see https://github.com/silverstripe/silverstripe-cms/pull/956) 2014-03-13 11:35:43 +13:00
Will Rossiter
dca9c7ca65 Merge pull request #956 from stojg/reportadmin-bug
BUG Report admin don't listen to filters
2014-03-13 10:41:55 +13:00
Ingo Schommer
e604ef833d Added min stability for composer
Required for scrutinizer runs
2014-03-13 10:17:10 +13:00
Stig Lindqvist
1625d126c2 BUG Report admin don't listen to filters
It seems like filter params that are added to the url are added in a bad way

Currently

    ?0[name]=filters[ContentReviewOwnerID]&0[value]=1

Expected:

    ?filters[ContentReviewOwnerID]=1
2014-02-25 17:20:25 +13:00
sheadawson
dc865399dc FIX fileexists check via ajax didnt know what folder the file was being uploaded to. Fixes #950 2014-02-20 15:17:04 +11:00
Ingo Schommer
118776672a Merge pull request #943 from hafriedlander/fix/extrameta_whitelist
FIX Limit ExtraMeta to only allow meta and link elements
2014-02-18 15:38:36 +13:00