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
Martijn
dec2be38fa
use Controller::join_links() for listview links
...
This fixes incorrect adding of the locale parameter when using translatable :
http://site.com/admin/pages/edit/show?locale=nl_NL/11
2013-12-06 15:45:15 +01:00
Ingo Schommer
87734cdfe1
Fixed ErrorPageTest Link() usage
2013-12-06 15:35:53 +01:00
Ingo Schommer
6403be518a
Backwards compat OldPageRedirector
...
Regression from f972466880
.
Passes tests in 3.1, but fails in master due to Deprecation notices.
Tests needed adjustments because OldPageRedirector::find_old_page()
doesn't have the same method signature...
2013-12-06 14:28:08 +01:00
Ingo Schommer
9ca336bea3
Merge remote-tracking branch 'origin/3.1'
2013-12-02 20:44:57 +01:00
Ingo Schommer
78b9ef2df3
More specific Behat assertion for page editability
2013-12-02 18:36:17 +01:00
Ingo Schommer
ec41cb38ce
ValidationException support in CMS "Settings" UI
2013-12-02 16:38:46 +01:00
Ingo Schommer
bd5f631af6
Reload "Settings" form on save ( fixes #895 )
...
Regression from 920da0d120
2013-12-02 16:38:46 +01:00
Ingo Schommer
8613e055ae
Merge pull request #904 from srizzling/is/cms/892
...
Added new step Pages can be editable by
2013-12-02 07:38:35 -08:00
Sriram Venkatesh
86301e627b
NEW STEP: Pages editable by and renamed manage page permissions feature file
2013-12-02 12:47:04 +13:00
Sean Harvey
a79ac87e2b
Fixing up scenarios for managing page permissions Behat tests.
...
Relies on changes from silverstripe-behat-extension:
silverstripe-behat-extension/pull/15
silverstripe-behat-extension/pull/14
silverstripe-behat-extension/pull/13
silverstripe-behat-extension/pull/12
2013-11-29 00:50:06 +01:00
Ingo Schommer
6804461539
Merge pull request #898 from dnadesign/errorpagepermissions
...
FIX: ErrorPage generating empty responses for 403/401 requests
2013-11-22 11:49:37 -08:00
Ingo Schommer
d80b822a25
Merge pull request #897 from axyr/master
...
Make Settings Link in CMSSettingsController clickable
2013-11-22 11:13:04 -08:00
Loz Calver
8f720406b5
Implement History.js logic for "Cancel" action
2013-11-22 12:46:03 +01:00
Michael Andrewartha
c6b16061bb
Adding behat test for changing theme of site using CMS dropdown
2013-11-21 11:18:05 +13:00
Loz Calver
95d9257b1b
ENHANCEMENT: Add 'Cancel' button to 'Add Page' form
2013-11-20 20:15:08 +01:00
Ingo Schommer
b6194c304d
Default CMSMain to Versioned::reading_stage("Stage")
...
Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
2013-11-20 14:26:48 +13:00
Will Rossiter
ddc2e3822b
FIX: ErrorPage generating empty responses for 403/401 requests
...
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular
I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
2013-11-18 16:32:15 +13:00
Sriram Venkatesh
e444b359ec
Implemented Behat test for page search ( fixes #620 )
...
Added Deleted state to UpdateState step defination
See https://github.com/silverstripe/silverstripe-cms/pull/896
2013-11-15 14:44:39 +01:00
Ingo Schommer
34c8fb22cb
Convert behat PHP to SS coding conventions
2013-11-15 12:04:16 +01:00
Martijn
0a854e9260
Make Settings Link in CMSSettingsController clickable
...
When SiteConfig has a GridField, you can't click on the Link to go back
2013-11-15 09:55:31 +01:00
Ingo Schommer
c3b7afbdb1
Merge pull request #883 from chillu/pulls/htmleditor-upload-replace
...
Behat tests for image upload from computer, editing images, etc
2013-11-12 15:10:42 -08:00