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,620 Commits 29 Branches 403 Tags 28 MiB
1b50d59aba
Commit Graph

4620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sean Harvey
e93abc6eb2 Fixing test failures because of Translatable and SiteTreeSubsites 2014-01-16 11:36:25 +13:00
Will Rossiter
c6082827dc Merge pull request #923 from axllent/master 
Fix typo in ONLYSELECTTWO alert
 2014-01-13 20:58:43 -08:00
axllent
c043d070f7 Fix typo in ONLYSELECTTWO alert 2014-01-14 13:40:06 +13:00
madmatt
938fb6f714 Fix behat tests for insert-a-link.feature 
- Fix "I can link to a file" scenario.
- Fix "I can link to an anchor” scenario.
- Fix "I can edit a link” scenario.
- MINOR: Grammar fixes.
- Fix "I can remove a link” scenario.
 2014-01-06 17:39:05 +13:00
madmatt
a1f02f80e0 Fix behat tests for insert-an-image.feature 
- Fix “I can insert an image from the CMS file store”.
- Remove unused scenario (we no longer support adding multiple images at once from the CMS).
- Fix “I can edit properties of an image before inserting it” scenario.
- Remove “I can edit dimensions of an image before inserting it” scenario - these fields no longer exist.
- Add documentation to explain why this scenario is marked @todo.
 2014-01-06 12:13:06 +13:00
madmatt
b097948568 Fix “I can insert an image from the CMS file store”. 2014-01-06 10:47:45 +13:00
Loz Calver
034bfc35c4 FIX: Changetracker causing 'saveButton is not a function' error 
Regression from 1571d35
 2014-01-03 11:34:23 +00:00
micmania1
47582b3e3c getViewer will now locate and use the correct templates for pages which don't have their own controller 2013-12-20 20:52:11 +00:00
Ingo Schommer
07033548fc Merge remote-tracking branch 'origin/3.1' 2013-12-19 20:22:26 +01:00
Ingo Schommer
046a5fd6bb Updated translation masters 2013-12-19 19:51:26 +01:00
Ingo Schommer
e009d0ef3d Merge pull request #912 from kinglozzer/cms-page-add-button-focus 
FIX: Prevent "Add Page" button being stuck 'focussed'
 2013-12-19 09:11:05 -08:00
Ingo Schommer
6f5d9927de Updated translations 2013-12-19 18:05:19 +01:00
Sean Harvey
c4cd203ab7 Merge pull request #913 from kinglozzer/assetadmin-delete-confirmation 
FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes silverstripe/silverstripe-framework#2639)
 2013-12-18 19:49:37 -08:00
Loz Calver
0a0ea33f58 FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes silverstripe/silverstripe-framework#2639) 2013-12-17 09:54:14 +00:00
Loz Calver
b964e870aa FIX: Prevent "Add Page" button being stuck 'focussed' 2013-12-16 14:44:24 +00:00
Ingo Schommer
1f17f4320d Page edit access with CMS_ACCESS_LeftAndMain (fixes #908) 
"Access to all sections" implies edit access in the CMS
 2013-12-13 10:05:06 +01:00
Ingo Schommer
288303c43c Merge pull request #899 from mandrew/3.1 
Adding behat test for changing theme of site using CMS dropdown
 2013-12-12 11:34:47 -08:00