Damian Mooyman
880ce895f5
Support custom table_name and DataObjectSchema
2016-06-14 15:37:41 +12:00
Daniel Hensby
a3d7d986a7
Merge branch '3'
2016-06-13 14:38:08 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4
2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3
2016-06-13 14:34:12 +01:00
Daniel Hensby
c8976a9d64
Merge branch '3.1' into 3.2
2016-06-13 14:33:35 +01:00
Damian Mooyman
c50bc91772
API Cleanup inconsistent SiteTree::duplicate API
2016-06-13 15:47:47 +12:00
Daniel Hensby
d6a57eb507
Amending redundant test
2016-06-04 23:03:06 +01:00
Damian Mooyman
04e617d65d
API Allow extensions to influence canCreate, canEdit, canView, canDelete, and canAddChildren even for admins.
...
Resolves issues where modules expect to apply business logic to models that admins must adhere to.
2016-05-24 10:16:14 +12:00
Frank Mullenger
1181cac123
MINOR: Removing camel cased 'Html' references.
2016-05-06 14:31:19 +12:00
Damian Mooyman
1aa5492410
API Cleanup SilverStripeNavigator and CMSPreview
2016-05-02 17:02:37 +12:00
Damian Mooyman
d7d6fd8758
Merge 3 into master
...
# Conflicts:
# code/controllers/CMSPageAddController.php
# code/model/ErrorPage.php
# composer.json
# css/screen.css
# tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
Damian Mooyman
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
Sam Minnee
46b35ecb0e
FIX: Changes to support php7 and new DBFields
...
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
2016-03-23 10:05:05 +13:00
Daniel Hensby
9d62d9d381
FIX Link tracking not escaping #
Fixes #1409
2016-03-21 15:22:00 +00:00
Damian Mooyman
067d44ac6c
API Update link tracking for image shortcodes
2016-03-21 09:08:31 +13:00
Damian Mooyman
4cc7b0806d
API Update to use new Versioned API
...
API CMS notifications for recursive operations
API Un-deprecated delete action and batch actions
API remove deprecated API
2016-03-17 13:44:26 +13:00
Damian Mooyman
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
Ingo Schommer
6a53e607f5
Replace CMSForm use with new setValidationResponseCallback() API
...
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
2016-03-07 16:49:33 +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
Ingo Schommer
94fcfa48ed
Merge pull request #1381 from open-sausages/pulls/4.0/versioned-asset-control
...
API Support versioned File management
2016-02-23 14:15:13 +13:00
Damian Mooyman
1c907dd227
API Support versioned File management
...
API Decouple File and ErrorPage
API Link tracking is now only performed on stage (in lieu of versioned relationships)
API Refactor versioned API methods out of SiteTree and into Versioned
2016-02-22 12:25:25 +13:00
Damian Mooyman
377af292be
Upgrade TinyMCE to 4.x
2016-02-15 14:58:24 +13:00
Damian Mooyman
3cefb2edad
Merge remote-tracking branch 'origin/3'
2016-02-12 15:42:33 +13:00
Damian Mooyman
17ee318d06
API VirtualPage permissions now can be set independently of the mirrored page
2016-01-27 10:01:14 +13:00
Daniel Hensby
0eb4b8e256
Merge pull request #1314 from kinglozzer/hide_ancestor
...
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 11:57:04 +00:00
Loz Calver
fb43e59b00
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 09:18:35 +00: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
Daniel Hensby
e9e6a9cca4
Merge pull request #1361 from kinglozzer/behat-coverage-file-link
...
Add behat coverage to check that file field is reset when adding links
2016-01-12 00:37:22 +00: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
Loz Calver
d637141487
FIX: preg_quote() anchors in SiteTreeLinkTracking ( fixes #1359 )
2016-01-11 16:44:55 +00:00
Sam Minnee
bf6337c59a
FIX: Changes needed to respond to whitespace changes.
...
I’ve made the ContentControllerTest whitespace agnostic, as it’s
possible that we change the whitespace semantics of includes in SS4
and I don’t want to make this test brittle to that.
2016-01-07 10:34:01 +13: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
Jonathon Menz
8ddef0b817
Decouple ErrorPage
2016-01-05 15:00:38 -08:00
Damian Mooyman
54ae002d19
BUG FIx merge regressions in versioned tests
2015-12-22 17:46:07 +13:00
Damian Mooyman
15685d85ab
Merge remote-tracking branch 'origin/3.2' into 3
2015-12-22 14:10:52 +13:00
Damian Mooyman
c50dc06401
API Update ErrorPage to use FilesystemGeneratedAssetHandler
2015-11-26 16:08:14 +13:00
Loz Calver
2983d823d1
FIX: Ensure VirtualPage forwards request/response data to virtual controllers ( fixes #1329 )
2015-11-18 09:14:11 +00:00
Damian Mooyman
b26c3a3b4e
Restore deprecated reports
2015-11-10 17:17:56 +13:00
Damian Mooyman
c6c650f136
BUG Ensure CMSMainTest uses correct siteconfig
...
BUG Prevent CMSAddPageController invoking Security::LoginForm code during error handling
2015-11-05 16:47:58 +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
Ingo Schommer
e3a321b306
Merge pull request #1304 from scott1702/update-upload-button
...
Update asset admin toolbar
2015-10-30 10:27:29 +13:00
scott1702
6dc3fc1f26
Update asset admin toolbar
2015-10-30 10:05:51 +13:00
Damian Mooyman
227e2ba162
API Move ErrorPage to new generated files API
2015-10-23 10:08:51 +13:00
Loz Calver
d7dcb41b27
FIX: Remove tab - invalid YAML
2015-10-19 17:10:47 +01: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
Patrick Nelson
75dc391df9
FIX for #586 and possible fix for #736 and relates to #2449 : Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint.
2015-10-09 15:36:21 -04: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
Damian Mooyman
8e3f549b19
BUG Fix regressions in CMS from db field changes
2015-09-28 17:22:44 +13:00
Damian Mooyman
e68a752ac7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-09-09 14:53:48 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Stephen Shkardoon
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12: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
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12: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
Damian Mooyman
71b23b622c
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-31 14:34:04 +12:00
Loz Calver
10b2fdc318
FIX: ContentController::getViewer() not returning all found templates ( fixes #1244 )
2015-07-24 11:50:09 +01: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
Loz Calver
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01: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
Nathan Glasl
0de71d45db
Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring.
2015-06-22 16:05:13 +10:00
Damian Mooyman
d5c7bf66a2
Fix test regressions
2015-06-19 10:47:19 +12:00
Daniel Hensby
715cd9ab4e
Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation
...
Conflicts:
tests/model/SiteTreeTest.php
2015-06-13 15:23:22 +01:00
Stevie Mayhew
a819bcfc97
FIX: explicitly call get functions for site tree checks
2015-06-05 11:09:23 +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
Damian Mooyman
1f9fc33349
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteTree.php
code/model/SiteTreeLinkTracking.php
tests/controller/CMSMainTest.php
2015-06-02 19:23:48 +12:00
Ingo Schommer
36ac61115a
Fix auto-setting of URL from localized page titles
...
Replace the hardcoded check for english locale ("new-page")
with a localized version.
See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Ingo Schommer
bb177249ba
Merge pull request #1170 from tractorcow/pulls/3.1/cms-test
...
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-04-29 00:12:47 +12:00
Damian Mooyman
cf4d9edafb
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteConfig.php
javascript/CMSMain.AddForm.js
tests/model/SiteConfigTest.php
tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Damian Mooyman
cabd8bbab9
Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
...
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
Damian Mooyman
6c92a86d2e
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-02-24 17:27:48 +13:00
Damian Mooyman
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
Stephen McMahon
9d888d5dde
BUG: Fixed SearchForm not calling getTemplate() in forTemplate()
2014-12-02 15:13:42 +11:00
Damian Mooyman
638fb46407
Resolve merge regressions
2014-11-19 11:04:20 +13:00
Loz Calver
a142ffd465
FIX: VirtualPages use correct casting for 'virtual' database fields
2014-11-17 15:44:17 +00:00
Mateusz Uzdowski
2ba1c46bc8
API Change broken link hihglighting to write to database.
...
Before it would be applied on the fly during the rendering of the
HtmlEditorField, and only be written to the database during the
subsequent write.
We just shift the behaviour to apply just-in-time.
2014-08-15 12:29:26 +12:00
Mateusz Uzdowski
b41e081130
Refactor the link-tracking code and move it from framework.
...
This code has a dependency on SiteTree, so it fits much better in the
cms module.
Abstracted away the content parser so the same code can be reused both
in the render phase (to highlight the links) and in the write phase
(storing information about broken links and references).
2014-08-14 11:16:49 +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
madmatt
4e5b1966d3
Fix changed pages filter to match SiteTree's 'MODIFIED' label
2014-08-07 16:48:06 +12:00
Damian Mooyman
53dbbb7982
BUG Fix CMSMain::getList to correctly respect filter result
...
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
2014-08-06 15:00:48 +12:00
Damian Mooyman
1c48cb6aae
BUG Fix search range for asset filter
2014-08-06 13:26:23 +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
Stig Lindqvist
3eefd65f7c
BUG: Narrowing site tree search to one date shows no pages
...
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
2014-07-24 15:24:03 +12:00
Damian Mooyman
a395c5322f
API Move of codebase to parameterised query database abstraction layer
...
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
2014-07-07 15:07:37 +12:00
Rodney Way
1e194854e0
BUG: Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy.
...
Also updated SiteTree YML test data to match.
2014-06-24 13:29:16 +10:00
Damian Mooyman
4ed41d6941
Fix tests covering old upload field behaviour
2014-06-18 09:14:47 +12:00
Damian Mooyman
519b0dfaa0
Merge remote-tracking branch 'origin/3.1'
2014-06-17 18:18:21 +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
6ac4324eb3
Merge remote-tracking branch 'origin/3.1'
2014-06-16 08:45:30 +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
1a85c7a1ec
Merge pull request #1022 from silverstripe-iterators/pulls/redirector-proto-relative
...
Pulls/redirector proto relative
2014-06-13 16:01:20 +12:00
Damian Mooyman
cba0061fe2
Merge pull request #974 from micmania1/930-added-breadcrumbs-getter
...
API Added getBreadcrumbItems to SiteTree
2014-06-03 08:43:53 +12:00
Ingo Schommer
40f7a876d4
Support for protocol relative RedirectorPage.ExternalURL
2014-05-30 00:01:45 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
micmania1
f46b6bde51
Added getBreadcrumbItems to SiteTree
2014-05-08 03:21:40 +01:00
Hamish Friedlander
435a5ee843
Merge pull request #1007 from tractorcow/pulls/3.1-security-errorpage
...
API Error page support for Security controller errors
2014-05-06 11:44:22 +12:00
Damian Mooyman
b3699281c0
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman
f9cb8805e1
API Error page support for Security controller errors
2014-05-05 17:13:11 +12:00
Damian Mooyman
c5d5d10094
BUG Behat now uses explicit radio button behaviour
2014-05-05 12:46:57 +12:00
Mateusz U
fcb6a9140c
Merge pull request #1004 from tractorcow/pulls/sitetree-title
...
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 14:37:29 +12:00
Damian Mooyman
341eeb7c31
Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
...
FIX: Broken file link tracking (fixes #996 )
2014-04-29 09:36:36 +12:00
Damian Mooyman
89fbae2c2e
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 08:54:17 +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
Loz Calver
396fd9a86e
FIX: Broken file link tracking ( fixes #996 )
2014-04-28 09:26:34 +01: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
61ebe08437
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:10:49 +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
Damian Mooyman
3204ab5af3
BUG Fix orphaned pages reporting they can be viewed
2014-04-07 12:52:07 +12:00
Damian Mooyman
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
Damian Mooyman
4b87b2e2e6
BUG Fix ContentControllerTest
2014-03-25 17:14:05 +13:00
Stephen Shkardoon
a67ed2799d
FIX Do now allow arbitary class creation in CMS
2014-03-19 19:27:39 +13:00
Simon Welsh
b497b8f548
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/reports/Report.php
2014-03-18 09:23:39 +13: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
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
Ingo Schommer
f6d929f05d
Merge remote-tracking branch 'origin/3.1'
2014-03-13 13:40:32 +13:00
Ingo Schommer
dee64bbb2d
Fixed behat image upload tests (contd.)
2014-03-13 13:39:59 +13:00
Ingo Schommer
702f6a2091
Merge remote-tracking branch 'origin/3.1'
2014-03-13 13:36:24 +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
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 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
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
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
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
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
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
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
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
677f38227c
Behat tests for image upload and overwrite in HTML editor
2013-10-24 14:49:51 +02:00
Ingo Schommer
ef0f633f46
Merge remote-tracking branch 'origin/3.1'
2013-10-23 14:53:33 +02:00
Mateusz U
27c8122123
Merge pull request #880 from halkyon/fulltextsearch_text
...
ContentControllerSearchExtensionTest doesn't clean up after itself.
2013-10-21 21:14:34 -07:00
Sean Harvey
ed8ee4e9b8
ContentControllerSearchExtensionTest doesn't clean up after itself.
...
The problem is FulltextSearchable::enable() does two things:
It enables the extension, as well as sets the MySQL create table option
to MyISAM. Later tests run with the extension enabled, because it doesn't
get removed at the end of the test, but the table type is set back to
InnoDB when the test is reset and schema recreated.
This produces side-effects where later tests in a suite tries to run
ALTER TABLE on File and add fulltext indexes when the table type
is set to InnoDB, causing an error.
2013-10-22 15:26:40 +13:00
Ingo Schommer
da1a875c4f
Revert "Moved Behat reports tests to module"
...
This reverts commit 50a48aa25d
.
The test in question relies on SiteTree data *as well* as the
reports module, so needs to be placed here.
2013-10-21 09:33:45 +02:00
Ingo Schommer
50a48aa25d
Moved Behat reports tests to module
2013-10-21 01:00:29 +02:00
Ingo Schommer
16d8505bbb
Merge remote-tracking branch 'origin/3.1'
2013-10-08 11:22:00 +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
f6c7bbb1ff
Merge remote-tracking branch 'origin/3.1'
2013-10-08 11:17:14 +02:00
Ingo Schommer
c0cc517635
Migrated behat features from framework
2013-10-08 00:23:44 +02:00
Ingo Schommer
1a40994527
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-10-06 19:07:52 +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
52ab9e570a
Fixed report link escaping
2013-10-02 12:01:34 +02:00
Ingo Schommer
fb9d7a595b
FIX ReportAdmin report links regression
...
Regression from 79996a76fe
,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-02 11:50:00 +02:00
Ingo Schommer
64608ea622
Merge pull request #860 from ajshort/virtual-page-test-cache
...
Fix test sometimes using cached relationship object.
2013-10-02 02:44:28 -07:00
Andrew Short
1f4cdfced8
Fix test sometimes using cached relationship object.
...
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
2013-10-02 15:03:50 +10: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
7ec9596b99
CMSMain assertion fail due to escaping
...
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
2013-09-30 22:44:44 +02:00
Ingo Schommer
cc2dcb2c4f
Merge remote-tracking branch 'origin/3.1'
2013-09-27 19:44:03 +02:00
Ingo Schommer
1a48afd499
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-27 19:39:23 +02:00
Ingo Schommer
30cf08b27e
CMSMain assertion fail due to escaping
...
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
2013-09-27 19:38:12 +02:00
Ingo Schommer
32478ab512
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer
8a96bab70d
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-27 18:50:52 +02:00
Ingo Schommer
fbb9a4449d
Removed stale salad tests, got behat now
2013-09-26 10:53:19 +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
Damian Mooyman
5f828149c3
BUG Fixed instances of loosely defined SQL predicates not qualified by table name
...
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Ingo Schommer
c62f992dc3
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:28 +02:00
Ingo Schommer
ba57d42349
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
code/controllers/ContentController.php
code/model/SiteTree.php
tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
1628cd130c
Skip html entity SearchFormTest for PostgreSQL
...
Should be fixed, but its not trivial.
2013-08-20 16:56:24 +02:00
Ingo Schommer
7ad9712f05
Merge remote-tracking branch 'origin/3.1'
2013-08-16 13:37:49 +02:00
Hamish Friedlander
71608f0d4a
FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself
2013-08-09 11:46:32 +02:00
Simon Welsh
b1664f86a4
FIX Check for stage and drafts in SiteTree::canView()
2013-08-09 10:45:09 +12:00
Andrew Short
1710958207
Merge branch '3.1'
...
Conflicts:
.travis.yml
code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Hamish Friedlander
a5f00ae2c3
FIX Not checking stage in SiteTree#canView
...
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
98750a9cf1
Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
...
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
f2a9f9aa0a
ErrorPageTest: Reset env state
...
Otherwise SapphireTest will complain, see 0da70dafa457564a6adb02140ffeb5dd01f3a982
2013-06-19 13:17:22 +02:00
Ingo Schommer
a29ce594a1
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:57 +02:00
Jeremy Thomerson
b8908efdf7
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 20:35:14 +00:00
Ingo Schommer
0c4b2f8157
API SiteTree->validURLSegment() prioritizes extension votes
...
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +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
c21c9cba0d
Merge remote-tracking branch 'origin/3.1'
2013-05-31 18:10:26 +02:00
Simon Welsh
be25c302ac
FIX Escape the sitetree_link shortcode return value
2013-05-10 14:05:06 +12:00
Sean Harvey
c7ebf76757
Page history panel: show appropriate message when viewing latest version
2013-05-07 17:14:28 +12:00
Ingo Schommer
2227ed3629
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:26:24 +02:00
Ingo Schommer
4087c14d1b
Fixed behat tests
2013-04-09 09:38:46 +02:00
Will Rossiter
6e2906d01e
API: remove static related classes, now staticpublisher module
2013-04-06 17:26:15 +13:00
Ingo Schommer
6457ab2433
Regression in URL generation (dots now filtered out)
...
Caused by framework/5ec85d06f68d09ab30b124312c54f1d84ce7d6f4
2013-04-02 11:39:46 +02:00
Ingo Schommer
8ae58398fe
Simplified travis builds (using external script)
2013-03-28 23:48:37 +01:00
Ingo Schommer
1e117d22a0
Simplified travis builds (external setup scripts)
2013-03-28 22:36:05 +01:00
Ingo Schommer
b23c9bba82
Simplified travis builds (external setup scripts)
2013-03-28 21:15:11 +01:00
Ingo Schommer
51c00e33e6
Merge remote-tracking branch 'origin/3.1'
2013-03-27 12:12:21 +01:00
Ingo Schommer
f73a5c68f3
FIX VirtualPageTest memory errors due to Config API quirks
2013-03-27 10:59:17 +01:00
Ingo Schommer
8eb3840325
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
Ingo Schommer
51c8e8639e
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Hamish Friedlander
68ebc5d221
FIX CMSMainTest to access batch_action config property properly
2013-02-27 15:00:41 +13:00
Ingo Schommer
1324024445
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:19:21 +01:00
Ingo Schommer
c09bca6fac
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/ja_JP.yml
lang/lt.yml
lang/pl.yml
2013-02-18 14:18:27 +01:00
Ingo Schommer
92db313ce7
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:14:42 +01:00
Ingo Schommer
1ef155fc18
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:13:24 +01:00
Ingo Schommer
8c3f87bb8a
Results returned from FSP->publishPages()
...
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
2013-02-06 10:47:41 +01:00
Ingo Schommer
eba4d205c3
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-01-30 12:44:40 +01:00
Ingo Schommer
b15b98345f
Using new "Security.login_url" configuration value
2013-01-29 18:06:49 +01:00
Ingo Schommer
8ab66c93b6
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/reports/Report.php
composer.json
2013-01-21 11:24:05 +01:00
Will Rossiter
56346a50bf
API: moved reports API to separate module
2013-01-17 21:58:03 +13:00
Ingo Schommer
8dd9bf3a1e
Merge remote-tracking branch 'origin/3.0' into 3.1
2012-12-17 17:34:20 +01:00
Ingo Schommer
894d48789c
String casting in SimpleXML tests for older phpunit versions
2012-12-17 17:32:46 +01:00
Ingo Schommer
a8478d2e46
Merge remote-tracking branch 'origin/3.0' into 3.1
2012-12-14 10:55:51 +01:00
Ingo Schommer
74d63791b7
Fixed regression in SiteTree->getCMSActions()
...
Caused by toolbar recent changes
2012-12-14 01:21:54 +01:00
Ingo Schommer
611c3f1b2e
Added travis environment info output
2012-12-12 15:14:11 +01:00
Ingo Schommer
df41fcdce4
Skip SearchFormTest if DB driver doesn't support fulltext
...
For now, the only case are specific SQL Server setups.
2012-12-11 15:18:58 +01:00
Ingo Schommer
084acc0fbd
Fixed Behat tests for preview feature
2012-12-10 18:09:55 +01:00
Ingo Schommer
1bf67fd942
Merge remote-tracking branch 'origin/3.0'
2012-12-10 18:09:34 +01:00
Ingo Schommer
4fa4ae726b
Adjusted Behat steps to new definition format
2012-12-10 15:38:32 +01:00
Ingo Schommer
f9a5601fa3
BUG Enforce "add page" restrictions, improve UI ( fixes #7879 )
...
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Ingo Schommer
3512ee82f4
Merge remote-tracking branch 'origin/3.0'
2012-11-28 16:36:30 +01:00
Ingo Schommer
e5f206065e
Using $TRAVIS_BRANCH again, since its now available on travis-ci.org
2012-11-28 16:33:50 +01:00
Ingo Schommer
7bd200f2db
Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency
...
Probably caused by a merge from 3.0
2012-11-28 16:14:01 +01:00
Sean Harvey
e5b2643a11
Merge branch '3.0'
2012-11-26 17:19:14 +13:00
Kirk Mayo
40a1a35618
BUG Namespaces for CmsFormsContext and CmsUiContext are wrong
2012-11-26 01:16:02 +01:00
Kirk Mayo
670c579153
BUG Namespaces for CmsFormsContext and CmsUiContext are wrong
2012-11-26 11:49:51 +13:00
Ingo Schommer
8d5cea550c
TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding
2012-11-23 16:31:51 +01:00
Ingo Schommer
e67474293f
More verbose travis build process
2012-11-23 16:20:14 +01:00
Ingo Schommer
b42cb5c308
Passing through $TRAVIS_BRANCH to before_script
2012-11-23 16:10:07 +01:00
Ingo Schommer
47e14f5e56
Fixed $TRAVIS_BRANCH env var usage in before_script
...
Fixes "class TableListField not found" errors in travis.
Before that, we've been testing the 3.0 cms with
master framework, which of course is a bad idea ;)
2012-11-23 15:59:01 +01:00
Ingo Schommer
76b99e4006
Fixed tests without assertions
2012-11-23 15:52:00 +01:00
Ingo Schommer
26bdee4f08
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
tests/model/SiteTreeTest.php
2012-11-23 15:31:03 +01:00
Ingo Schommer
ff1df3696f
Limiting redirection-follow to specific tests in CMSMainTest
...
Fixes *some* quirks when running tests with
the 'translatable' module enabled (which redirects
to URLs with ?locale=<locale> in the CMS by default).
2012-11-23 15:30:11 +01:00
Ingo Schommer
8659c27487
Remove unused set_up_once() invocations from various tests
...
SapphireTest method name was changed to instance method
and setUpOnce() naming in mid 2010 already (093da759).
Since those methods were never invoked, they're obsolete.
Checked that the SiteTree-related tests pass with
Translatable enabled.
2012-11-23 13:58:54 +01:00
Ingo Schommer
e6e12fe00e
Merge branch '3.0'
...
Conflicts:
composer.json
2012-11-22 23:48:18 +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
Andrew O'Neil
48a9bcf276
APICHANGE: Use late static binding for Object::remove_extension()
2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869
APICHANGE: add_extension() is now called directly on the class, instead of on Object
2012-11-07 11:08:36 +13:00
Ingo Schommer
db3499cdf5
Merge remote-tracking branch 'origin/3.0'
2012-10-16 10:26:09 +02:00
Damian Mooyman
d50cb230e4
BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database
...
Fixed issue
2012-10-16 16:48:27 +13:00
Simon Welsh
38f28deafe
Adds Travis testing to the CMS
2012-09-27 13:00:49 +12:00
Sean Harvey
b92f759963
Fixing test to be less fragile (selects the input ID directly instead of holder)
2012-09-27 12:14:14 +12:00
Sean Harvey
cb8c10a473
Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0
2012-09-27 10:49:03 +12:00
Sean Harvey
2c4ebd3cb9
Fixing broken SiteTreeHTMLEditorFieldTest
2012-09-23 22:49:44 +12:00
Ingo Schommer
cbd31e3ab2
API Removed SiteTree.MetaTitle and MetaKeywords
...
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.
[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
2012-09-21 11:31:00 +02:00
Ingo Schommer
77ef6570a3
Merge remote-tracking branch 'origin/3.0'
2012-09-21 10:48:22 +02:00
Simon Welsh
4506e92536
Adds Travis testing to the CMS
2012-09-21 15:43:01 +12:00
Ingo Schommer
df44239060
Method visibility according to coding conventions
2012-09-20 10:41:50 +02:00
Ingo Schommer
1cd82e2db1
BUG Enforce $allowed_children in controllers on page creation ( fixes #7694 )
...
Original bug fix contributed by @kmayo-ss
2012-09-02 18:20:22 +02:00
Ingo Schommer
8a514d8b64
BUG Correct live state in SiteTree->getAbsoluteLiveLink()
...
Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
2012-08-28 19:04:16 +02:00
Hamish Friedlander
d45dd34db9
FIX VirtualPageTest failing on apps with no $db on Page
...
VirtualPageTest was adding fields to Page via a decorator, but Page might
not have any fields itself. This changed Page from not having a table
to having a table, which then caused a problem on tearDown
2012-08-28 15:13:57 +12:00
carlos barberis
f7b6f1de5a
BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment
2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
54fd54a2fb
BUG Change all shortcodes into the new, comma separated, format.
...
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 17:57:38 +02:00