Commit Graph

565 Commits

Author SHA1 Message Date
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
70179c8b87
API Better behaviour for virtualised controller 2016-08-04 14:19:33 +12:00
Daniel Hensby
1ae58bbc82
Merge branch '3' 2016-07-25 14:51:39 +01:00
Robbie Averill
82e54314bf FIX do not show HiddenClass pages in allowed children (#1555)
* FIX do not show HiddenClass pages in allowed children

* Resolves #1553

* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
2016-07-22 09:45:14 +01:00
Damian Mooyman
abda4dc2d8
BUG Restore SiteTree::canPublish method to resolve incorrect fallback to SiteTreeExtension
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5625
2016-07-18 10:59:07 +12:00
Hamish Friedlander
0f950800ef FIX wrongly named themes after themestack API change (#1548) 2016-07-15 17:13:53 +12:00
Daniel Hensby
e5aad336ce Merge pull request #1525 from tractorcow/pulls/4.0/dupe-api
API Cleanup inconsistent SiteTree::duplicate API
2016-07-14 00:41:40 +01:00
Daniel Hensby
dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
Damian Mooyman
25e4cad164
API Apply SilverStripe\Security namespace 2016-07-05 15:08:05 +12:00
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace 2016-06-24 11:00:21 +12:00
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