Daniel Hensby
12c0f3c1c7
Merge branch '3.1' into 3.2
2016-10-16 22:40:56 +01:00
Damian Mooyman
7751a6cee7
Behat test cases for site tree duplication ( #995 )
2016-09-16 11:44:07 +12:00
Damian Mooyman
a87a857a6e
Upgrade code for framework namespaces
...
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
2016-09-07 16:29:26 +12:00
Paul Clarke
9a812101fb
Update tests
2016-09-05 11:23:12 +12:00
Ingo Schommer
b599095a50
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 23:15:12 +12:00
Damian Mooyman
4dfa4f4473
Resolve issues with namespacing
2016-08-10 16:09:23 +12:00
Damian Mooyman
5bf364bedb
Apply SilverStripe\CMS namespace
2016-08-10 16:09:23 +12:00
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace
2016-06-24 11:00:21 +12:00
Damian Mooyman
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
Damian Mooyman
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
Ingo Schommer
a3ee8b92be
Merge remote-tracking branch 'origin/3.3' into 3
2016-03-07 08:49:47 +13:00
Ingo Schommer
859fd5562f
Behat "insert link" regression
...
See 361c9a03fe62431ea9f3fda200df80470334835f
2016-03-07 08:48:02 +13:00
Ingo Schommer
dd71c8d9df
Remove Behat-related code dependant on PHPUnit 3.x
...
We've upgraded SilverStripe core to PHPUnit 4.x now
2016-02-24 20:11:21 +13:00
Damian Mooyman
beba0f2551
BUG Fix behat tests for asset abstraction
...
Requires https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/111
2016-02-24 15:01:40 +13:00
Damian Mooyman
377af292be
Upgrade TinyMCE to 4.x
2016-02-15 14:58:24 +13:00
Damian Mooyman
7dfe145412
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# code/controllers/CMSFileAddController.php
# code/controllers/CMSPageAddController.php
# code/controllers/CMSPageHistoryController.php
# code/controllers/CMSSiteTreeFilter.php
# code/controllers/ContentController.php
# code/controllers/LeftAndMainPageIconsExtension.php
# code/controllers/SilverStripeNavigator.php
# code/model/SiteTreeFileExtension.php
# code/model/VirtualPage.php
# composer.json
# tests/model/ErrorPageTest.yml
# tests/model/FileLinkTrackingTest.yml
# tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
Damian Mooyman
c3e82a4838
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# javascript/lang/src/fi.js
2016-01-19 17:10:41 +13:00
Damian Mooyman
e706b147cc
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-01-19 15:08:33 +13:00
Loz Calver
e19dfd628b
Add behat coverage to check that file field is reset when adding links
2016-01-11 17:08:28 +00:00
Sam Minnee
bbc3aaaf9f
MINOR: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Damian Mooyman
18e368448a
Merge remote-tracking branch 'origin/3'
...
Conflicts:
code/controllers/AssetAdmin.php
code/controllers/CMSMain.php
code/controllers/CMSSiteTreeFilter.php
code/controllers/LeftAndMainPageIconsExtension.php
code/controllers/ModelAsController.php
code/controllers/SilverStripeNavigator.php
code/model/ErrorPage.php
code/model/SiteTreeFileExtension.php
2015-11-03 14:23:04 +13:00
Damian Mooyman
748866ec0f
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
code/controllers/CMSMain.php
code/model/ErrorPage.php
2015-11-03 13:11:26 +13:00
scott1702
6dc3fc1f26
Update asset admin toolbar
2015-10-30 10:05:51 +13:00
Damian Mooyman
2bd9d00da0
API Remove filesystem sync
...
API support new asset abstraction
BUG Fix file link tracking for new asset abstraction
2015-10-19 13:42:39 +13:00
David Craig
1ea22c766c
Move UI to main assets area
2015-09-29 09:35:28 +13:00
Peter Thaleikis
f291c5f365
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-09-28 22:31:31 +13:00
Daniel Hensby
bf6a84bd2f
Fixing behat regression
2015-08-18 00:34:49 +01:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Damian Mooyman
a6677b1653
API respect custom attributes on OptionsetField and CheckboxSetField
...
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
2015-08-03 16:08:56 +12:00
Dan Hensby
a94881372f
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-20 14:14:28 +00:00
Daniel Hensby
f55b22bd75
Merge branch '3.1' into 3.2
...
Conflicts:
CONTRIBUTING.md
code/reports/BrokenLinksReport.php
code/reports/SideReport.php
tests/model/RedirectorPageTest.php
tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Ingo Schommer
ce85764292
Behat tests hotlinking to non-existant image
...
Caused by silverstripe.com redesign. Ideally we'd
have a permanent asset hosted there which is clearly marked as a test dependency.
Or create a placeholder for images linked served localhost within the Behat tests,
in which case we wouldn't require a network connection to execute Behat.
2015-07-18 15:38:44 +12:00
David Craig
41ce038c8f
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:23:37 +12:00
Damian Mooyman
3b90fef04f
BUG fix behat tests
...
Fixes #1223
2015-07-01 13:24:44 +12:00
David Craig
cc3385b9f8
Move filters from panel to header
...
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
- Renamed to Bulk actions
- Styles updated
- Added placeholder text / removed redundant option
- Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Damian Mooyman
b169823a00
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Mateusz Uzdowski
52d297e6ef
Merge remote-tracking branch 'origin/3.1' into merge-back
...
Conflicts:
code/controllers/CMSSiteTreeFilter.php
code/controllers/ReportAdmin.php
code/reports/Report.php
2014-08-13 17:19:01 +12:00
Will Rossiter
18d6c538a7
API: Extract siteconfig out to an external module.
2014-08-09 17:29:50 +12:00
Damian Mooyman
42755ebf5b
Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347
2014-08-01 12:04:58 +12:00
Stig Lindqvist
482c23f18e
NEW Adding CMS sitetree filter to see the current 'live' site
...
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
2014-07-29 13:12:36 +12:00
Damian Mooyman
4ed41d6941
Fix tests covering old upload field behaviour
2014-06-18 09:14:47 +12:00
Damian Mooyman
b8d19ba495
BUG Fix deleted pages redirecting the CMS
...
Update behat tests for Mink 1.6 compatibility
2014-06-17 10:36:08 +12:00
Ingo Schommer
e1f82aba49
Removed goutte driver from Behat, not supported
...
Was added way back with the original behat.yml, and then forgotten about
2014-06-16 08:39:54 +12:00
Damian Mooyman
c5d5d10094
BUG Behat now uses explicit radio button behaviour
2014-05-05 12:46:57 +12:00
Ingo Schommer
9bff36c078
Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
...
API Filter by date created for files
2014-04-28 23:40:17 +12:00
Russell Michell
a502c9d21c
NEW Fixes #966 . Ability to filter pages on page status.
...
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
2014-04-28 14:50:07 +12:00
Damian Mooyman
3765030faa
API Filter by date created for files
...
Added test cases
Do not merge before https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/32
ref: CWPBUG-144
2014-04-15 09:42:53 +12:00
Simon Welsh
7002dcfa7f
Assets table just shows the name, not the path
2014-03-18 08:56:41 +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
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
Sriram Venkatesh
3f28d72065
Adding AdminAssets filter Behat tests
2014-02-18 11:22:38 +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
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
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
Ingo Schommer
78b9ef2df3
More specific Behat assertion for page editability
2013-12-02 18:36:17 +01: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
Michael Andrewartha
c6b16061bb
Adding behat test for changing theme of site using CMS dropdown
2013-11-21 11:18:05 +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
677f38227c
Behat tests for image upload and overwrite in HTML editor
2013-10-24 14:49:51 +02:00
Ingo Schommer
d532d05fc2
Moved manage-files.feature from framework
...
It relies on AssetAdmin which is placed in the 'cms' module
2013-10-08 11:20:50 +02:00
Ingo Schommer
c0cc517635
Migrated behat features from framework
2013-10-08 00:23:44 +02:00
Ingo Schommer
0437c0597d
More resilient Behat checks for "page not found"
...
Wrapping in a step to capture cases where the ErrorPage defaults
haven't been generated, and the default ModelAsController
message shows which is slightly different wording.
2013-10-02 17:12:43 +02:00
Ingo Schommer
2a4191d449
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8
Fixed report link escaping
2013-10-02 12:19:23 +02:00
Ingo Schommer
956b6de05c
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0
FIX ReportAdmin report links regression
...
Regression from 79996a76fe
,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-01 11:17:36 +02:00
Ingo Schommer
16c802f7e1
More specific behat tree assertions
2013-09-14 00:21:29 +02:00
Ingo Schommer
7ec7a263c0
Behat scenarios for page permissions and search (steps only)
...
Actual step implementation not done yet
2013-09-13 18:46:23 +02:00
Ingo Schommer
e9fe4f7c68
Behat: Removed unnecessary access-user-help.feature
...
It doesn't add much value in terms of testing
(can't see how we'd ever mess up the "Help" menu entry),
and it relies on the availability of an external resource
(userhelp.ss.org), making the tests more brittle.
It also breaks the feature following this one, because
somehow Behat doesn't reset the browser session, so
subsequent logins fail because a login still exists.
2013-06-07 11:42:02 +02:00
Ingo Schommer
5476bbeefb
Behat: Fixed indentation (no functional changes)
...
Using tabs consistently
2013-06-07 10:21:05 +02:00
Stig Lindqvist
b3f31d8e6f
Behat: New feature "Edit site wide title and tagline" #619
2013-06-07 17:46:37 +12:00
Mike Parkhill
ea29c1276b
Behat: Adding user help scenario #607
2013-06-07 17:46:15 +12:00
Stig Lindqvist
08850da71e
Behat: Type case in step definition
2013-06-07 16:17:44 +12:00
Stig Lindqvist
2a8307d794
Behat: Adding page publishing scenarios #616
2013-06-07 15:04:43 +12:00
Stig Lindqvist
a6be891214
Behat: Save draft notifications have changed
2013-06-07 11:40:46 +12:00
Ingo Schommer
df1836add2
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/behat/features/edit-a-page.feature
tests/behat/features/preview-a-page.feature
2013-06-05 14:39:21 +02:00
Ingo Schommer
d2105ef7a6
More verbose fixture step definitions
...
Too many clashes with other steps otherwise,
e.g. with 'And the preview contains "You can fill"'.
Also removed some duplicated code no longer necessary
because we use inheritance rather than composition
2013-06-05 14:25:29 +02:00
Ingo Schommer
8bd1e4373d
Behat: Fixed spelling in test
2013-06-05 13:37:19 +02:00
Ingo Schommer
47d7a19a23
Behat: Replace @database-defaults with explicit fixtures
2013-06-05 13:30:15 +02:00
Ingo Schommer
e7cc08f6ae
Behat: Auto-publishing SiteTree fixtures, RedirectorPage fixtures
...
They can be unpublished through an explicit step.
Extending from base FeatureContext in order to easily
share the same FixtureFactory but still add new blueprints to it.
2013-06-05 13:29:48 +02:00
Ingo Schommer
4087c14d1b
Fixed behat tests
2013-04-09 09:38:46 +02:00
Ingo Schommer
084acc0fbd
Fixed Behat tests for preview feature
2012-12-10 18:09:55 +01:00
Ingo Schommer
4fa4ae726b
Adjusted Behat steps to new definition format
2012-12-10 15:38:32 +01:00
Kirk Mayo
40a1a35618
BUG Namespaces for CmsFormsContext and CmsUiContext are wrong
2012-11-26 01:16:02 +01:00
Ingo Schommer
20a817875a
Shortened behat.yml
2012-11-14 00:51:21 +01:00
Ingo Schommer
df23a6ce1a
Corrected step wording
2012-11-14 00:51:21 +01:00
Ingo Schommer
9841d5b074
NEW Added Behat tests
2012-11-14 00:51:21 +01:00