tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-30 00:19:44 +02:00
Code Issues Projects Releases Wiki Activity
4,143 Commits 30 Branches 398 Tags 25 MiB
755f4f1557
Commit Graph

4143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Stephen Shkardoon
a67ed2799d FIX Do now allow arbitary class creation in CMS 2014-03-19 19:27:39 +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
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
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
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
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
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
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
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
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