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
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
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
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
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
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
Ingo Schommer
e2fa3b7f2c
Updated translations
2013-11-08 00:59:07 +01:00
Damian Mooyman
f9c3f4d1cc
Merge pull request #889 from chillu/pulls/2638-uploadfield
...
Disable UploadField change detection in assets/admin/add
2013-11-06 17:16:17 -08:00
Ingo Schommer
77ef09e857
Merge pull request #801 from ss23/refactor-old-page-redirector
...
Refactor old page redirector into an extension
2013-11-06 02:14:38 -08:00
Stephen Shkardoon
f972466880
Refactor old page redirector into an extension
2013-11-06 23:00:50 +13:00
Ingo Schommer
2d0ee2ca91
Disable UploadField change detection in assets/admin/add
...
See https://github.com/silverstripe/silverstripe-framework/issues/2638
2013-11-06 10:08:15 +01:00
Ingo Schommer
35a84e4eae
Merge pull request #884 from chillu/pulls/js-i18n-3.1
...
API JS i18n files with short locale names, generated by build task
2013-11-01 04:24:34 -07:00
Will Rossiter
5101db9472
Merge pull request #888 from kinglozzer/patch-1
...
Set default encoding for compass
2013-10-29 22:37:26 -07:00
Loz Calver
634ee2e8b6
Set default encoding for compass
...
See https://github.com/silverstripe/silverstripe-framework/pull/2620
2013-10-29 10:51:01 +00:00
Will Rossiter
a24d84a6df
Merge pull request #887 from trev/patch-1
...
Fix comment typo
2013-10-27 22:24:36 -07:00
Trevor
e3724e9207
Fix comment typo
2013-10-28 13:48:31 +11:00
Ingo Schommer
b726180ab8
API JS i18n files with short locale names, generated by build task
...
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.
See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 01:26:57 +02:00
Ingo Schommer
677f38227c
Behat tests for image upload and overwrite in HTML editor
2013-10-24 14:49:51 +02:00
Ingo Schommer
79c0b6cf28
Merge pull request #881 from kinglozzer/framework-1905-controller-inheritance
...
NEW: Page types no longer require their own controller (fixes silverstripe/silverstripe-framework#1905 )
2013-10-23 11:01:42 -07:00