Simon Welsh
b497b8f548
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/reports/Report.php
2014-03-18 09:23:39 +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
f6d929f05d
Merge remote-tracking branch 'origin/3.1'
2014-03-13 13:40:32 +13:00
Ingo Schommer
dee64bbb2d
Fixed behat image upload tests (contd.)
2014-03-13 13:39:59 +13:00
Ingo Schommer
702f6a2091
Merge remote-tracking branch 'origin/3.1'
2014-03-13 13:36:24 +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
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
cc95083f1f
Merge remote-tracking branch 'origin/3.1'
2014-03-13 10:18:28 +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
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13: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
Ingo Schommer
ca37dc8e69
Updated translations
2014-02-18 11:50:04 +13:00
Sriram Venkatesh
3f28d72065
Adding AdminAssets filter Behat tests
2014-02-18 11:22:38 +13:00
Sean Harvey
311e0d0ede
Merge pull request #945 from patbolo/save-buttons-status-issue
...
FIX JS issue when enabling save buttons for when the content has changed...
2014-02-18 10:24:32 +13:00
jean
5f2d78a2dc
FIX JS issue when enabling save buttons for when the content has changed. Current implementation triggers a 'Object is not a function' error. New implementation follows the same logic as in the onmatch function, and uses .button() as the function
2014-02-17 14:34:12 +13:00
Hamish Friedlander
224033e518
FIX Limit ExtraMeta to only allow meta and link elements
2014-02-17 12:08:09 +13:00
Sam Minnée
9674b2efb4
Merge pull request #941 from sminnee/fix-content-getviewer
...
FIX: Fix failover to index template in ContentController::getViewer()
2014-02-14 17:46:47 +13:00
Sam Minnee
d0a4fc2065
FIX: Fix failover to index template in ContentController::getViewer()
...
Historically, if you visit a foo action on Page, and Page_foo.ss doesn't exist, then it fails over
to Page.ss. The introduction of ContentController::getViewer() broke this, but this patch adds a
test for this case and fixes it.
It was identified by build failures on silverstripe/userforms when tested against the master branch.
2014-02-14 17:44:53 +13:00
Sam Minnee
3aa95f4c83
Merge remote-tracking branch 'origin/3.1'
2014-02-14 14:05:05 +13:00
Sam Minnée
9c46c7d1e8
Merge pull request #937 from sminnee/fix-theme-test
...
FIX: Fixed testing of theme switching.
2014-02-14 13:43:56 +13:00
Sam Minnee
d69c8e5069
Minor improvement of theme switching test performance.
2014-02-14 13:43:34 +13:00
Sam Minnee
c0e6bf7132
FIX: Added proper state-restoration code to the ThemeContext:
2014-02-14 12:31:37 +13:00
Sam Minnee
ab4b72d486
FIX: Fixed testing of theme switching.
...
The previous theme test relied on the existence of the tutorial theme, which has been removed.
I'ved added a couple of behat rules for scaffolding fake themes, and altered the test to use these.
2014-02-14 12:14:20 +13:00
Ingo Schommer
0d34b68061
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-02-12 15:18:39 +13:00
Sean Harvey
0bb5b4c8a4
Merge branch '3.1'
2014-02-12 11:13:29 +13:00
Ingo Schommer
14352f56a8
Merge pull request #935 from yearofthegus/doctag_fixes
...
Numerous PHPDoc fixes.
2014-02-11 09:40:27 +13:00
Gus King
7b4cc316ef
Numerous PHPDoc fixes.
2014-02-10 15:35:13 -05:00
Ingo Schommer
74ed4120a2
Merge pull request #932 from yearofthegus/document-magic
...
Documented magic properties/methods of SiteTree and SiteConfig.
2014-02-10 13:35:36 +13:00
Gus King
457cadb103
Documented magic properties/methods of SiteTree and SiteConfig.
2014-02-09 19:13:04 -05:00
Ingo Schommer
5ebb484b20
Fixed ContentControllerTest
2014-02-07 15:56:20 +13:00
Ingo Schommer
683b099308
Merge pull request #914 from micmania1/900-page-templates-without-controller
...
NEW Locate page template without needing to define a controller
2014-02-07 14:20:30 +13:00
Ingo Schommer
172a1816f9
Merge remote-tracking branch 'origin/3.1'
2014-02-04 07:56:10 +13:00
Russell Michell
7d7c75414c
NEW Track broken anchors
2014-01-31 12:44:59 +13:00
Mateusz U
5e79e66ccc
Merge pull request #927 from halkyon/cmsmainsearch_test_fix
...
Fixing test not auto-following admin/pages/SearchForm
2014-01-16 16:45:00 -08:00
Sean Harvey
e9b10e5b16
Fixing test not auto-following admin/pages/SearchForm
...
With additional modules like Translatable, this test fails because
a 301 is issued to redirect the admin/pages/SearchForm request to the
correct URL containining a locale in the query string.
2014-01-17 12:57:28 +13:00
Mateusz U
b52002724e
Merge pull request #926 from halkyon/virtualpage_extensions_fix
...
Fixing test failures introduced by Translatable and SiteTreeSubsites
2014-01-16 14:16:25 -08:00
Sean Harvey
93dca704fb
Fixing test failures introduced by Translatable and SiteTreeSubsites
...
Same fix as e93abc6
, except it applies to VirtualPageTest.
2014-01-17 10:36:00 +13:00
Mateusz U
c8c56756a9
Merge pull request #924 from halkyon/modules_illegal_extensions_tests
...
Fixing test failures because of Translatable and SiteTreeSubsites
2014-01-15 16:15:19 -08:00