Daniel Hensby
05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update
2017-06-15 12:50:49 +01:00
Simon Erkelens
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
Christopher Joe
844420df40
Enhancement Translation strings updated
2017-05-31 16:08:54 +12:00
Daniel Hensby
08093ea308
Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy
2017-05-30 22:52:22 +01:00
Daniel Hensby
5116476875
FIX Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped
2017-05-30 22:23:55 +01:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal
2017-05-30 11:00:32 +12:00
Daniel Hensby
eaee3b6a8b
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:21:22 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:55 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-24 23:02:41 +01:00
Damian Mooyman
0abce5e859
Remove object class
2017-05-18 17:13:51 +12:00
Damian Mooyman
eebae1f766
BUG Fix insert link behat command
2017-05-16 16:47:07 +12:00
Damian Mooyman
49e559b08c
API Rename services to match FQN of interface / classes
2017-05-16 15:49:09 +12:00
Christopher Joe
f3b442e9b4
Fix behat tests for insert link to work with react implementation
2017-05-16 11:45:15 +12:00
Damian Mooyman
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
Damian Mooyman
df100b8798
API Upgrade to behat 3
2017-05-05 17:19:41 +12:00
Uncle Cheese
6fb1012eb8
Ran upgrader for lang files
2017-04-27 11:43:04 +12:00
Daniel Hensby
7e77753274
FIX intl test
2017-04-21 15:17:47 +01:00
Damian Mooyman
2225af75c3
Update RedirectorPageTest
2017-04-20 11:16:14 +12:00
Ingo Schommer
9cad8ba01b
Fixed linting
2017-04-12 08:21:02 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
...
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +12:00
Daniel Hensby
72cbf83507
Test fixes for upstream changes
2017-03-30 15:37:22 +01:00
Damian Mooyman
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
Damian Mooyman
c7d9947976
Update SearchFormTest
2017-03-13 11:45:29 +13:00
Damian Mooyman
f65a164818
Update SearchForm
...
Fix RedirectorPageTest
2017-03-10 15:04:02 +13:00
Christopher Joe
2fafff084f
Fix history comparison fields will now show diff properly, rather than escaped html diff
2017-02-28 16:26:11 +13:00
Damian Mooyman
8766a4c91b
Cleanup unit test classes
2017-02-28 15:46:19 +13:00
Damian Mooyman
358bb8baec
API Remove insert-media tests (now covered by asset-admin, not cms)
2017-02-27 11:00:10 +13:00
Ingo Schommer
6bae804744
API Use symfony/cache
...
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
Damian Mooyman
945eba8efb
Update CMS for new i18n API
2017-02-09 16:11:11 +13:00
Damian Mooyman
c7214b4dcd
Auto-convert to psr2
2017-01-31 13:59:35 +13:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend
2017-01-26 11:39:20 +13:00
Robbie Averill
773c848c0f
FIX Separate PageController fixture into its own file (PSR-2 compat)
2017-01-12 10:05:05 +13:00
Daniel Hensby
05b5e545e0
Merge pull request #1703 from robbieaverill/feature/psr2-compliant-controller-names
...
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 15:28:11 +00:00
Damian Mooyman
ebe09393db
Update behat tests for new button styling
2017-01-11 17:36:30 +13:00
Christopher Joe
947c1fe156
Fix broken unit test
2017-01-11 17:36:30 +13:00
Robbie Averill
cf3a74ec57
FIX Remove deprecation tests, bump deprecation version to 5.0
2017-01-11 10:02:51 +13:00
Robbie Averill
0927e54780
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 10:02:51 +13:00
Daniel Hensby
fc45e9e0ab
Fixing tests
2016-12-28 17:24:54 +00:00
Daniel Hensby
916d7f3815
Fixing tests
2016-12-28 17:10:45 +00:00
Daniel Hensby
7a296a541b
Merge branch '3'
2016-12-28 17:00:32 +00:00
Damian Mooyman
bf58c5aef4
API Update to use new form submission handling ( #1691 )
2016-12-09 16:00:46 +13:00
Daniel Hensby
4a1cf3d4fb
Merge branch '3.5' into 3
2016-11-28 14:02:13 +00:00
Daniel Hensby
21d9b7cdf1
Merge branch '3.3' into 3.4
2016-11-28 13:57:38 +00:00
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3
2016-11-28 13:56:51 +00:00
Damian Mooyman
38070ab2d3
API Update tests to reflect renamed services
2016-11-23 19:28:10 +13:00
Loz Calver
b2503ac004
FIX: content authors unable to duplicate top-level pages ( fixes #1685 )
2016-11-22 15:55:28 +00:00
Nathan
a5b33ab916
Correcting an issue where page controller methods
...
would end up with the error page response code, causing them to not work. This code only looks to be causing issues from what I can see.
An example is an autocomplete that is populated using a method on page controller. The moment you end up on a 404 error page, the autocomplete will attempt to populate and end up with a 404 response.
2016-11-21 15:43:37 +11:00
Ingo Schommer
0d788ddfbc
NEW: Code Coverage via CodeCov.io ( #1631 )
...
* Add phpunit.xml.dist for code coverage whitelist
* Fixed @covers with namespaces
* Increase memory_limit to allow code coverage run. phpdbg can peak to more than 1GB built-in.
Travis allows up to 3GB of useable memory:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
https://github.com/silverstripe/silverstripe-cms/pull/1631
2016-11-21 15:17:25 +13:00
Daniel Hensby
5bd7662cb4
Merge branch '3'
2016-11-03 15:32:47 +00:00
Damian Mooyman
4bf4fca416
BUG Prevent archived pages from having add to campaign action
...
Fixes #1626
2016-10-31 15:24:07 +13:00
Damian Mooyman
e242af48df
Remove @todo behat test
2016-10-31 10:01:44 +13:00
Sam Minnee
7d18cda7ee
FIX: Test fixes needed for the new simplified test run structure.
2016-10-28 17:48:51 +13:00
Sam Minnee
eef14c1afc
FIX: Fix behat tests.
...
Update behat test config for simplified test run.
2016-10-28 17:47:59 +13:00
Sam Minnee
bf9939e32c
NEW: Refactor test bootstrap to be more modular.
...
The test bootstrap is broken into units that can be combined for
different test situations:
- phpunit
- behat
- serve
2016-10-28 17:47:53 +13:00
Damian Mooyman
13d40f96f3
API Rename _versions table to _Versions ( #1655 )
...
See https://github.com/silverstripe/silverstripe-framework/pull/6203
2016-10-25 14:03:45 +13:00
Damian Mooyman
d54ae8bb26
API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour ( #1653 )
...
API Update to support new versioned dataobject behaviour
2016-10-25 13:22:31 +13:00
Daniel Hensby
147181e96f
Merge branch '3.3' into 3.4
2016-10-16 22:42:40 +01:00
Daniel Hensby
bc71f2de01
Merge branch '3.2' into 3.3
2016-10-16 22:42:26 +01:00
Daniel Hensby
12c0f3c1c7
Merge branch '3.1' into 3.2
2016-10-16 22:40:56 +01:00
Damian Mooyman
1ce243ccc1
API Cleaned up versioned status checks
2016-10-06 10:31:25 +13:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained
2016-10-03 22:08:05 +01:00
Sam Minnee
0a561f1656
MINOR: class name references
...
- Replace get_class($this) with static::class
- Replace __CLASS__ with self::class
2016-09-28 11:55:15 +13:00
Loz Calver
62816e1ff8
Refactor VirtualPage, remove VirtualPage_Controller
2016-09-22 14:37:54 +01:00
Damian Mooyman
7751a6cee7
Behat test cases for site tree duplication ( #995 )
2016-09-16 11:44:07 +12:00
Damian Mooyman
2dae4e2adc
Rename SS_ prefixed class names
2016-09-09 11:26:24 +12:00
Ingo Schommer
ac954095ab
Merge pull request #1602 from open-sausages/pulls/4.0/namespace-everything
...
Upgrade code for framework namespaces
2016-09-08 17:44:45 +12:00
Daniel Hensby
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01: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
Damian Mooyman
9c48b93983
BUG Ensure changes in class write to an instance of the new class, not the old one
...
Fixes #1210
Requires https://github.com/silverstripe/silverstripe-framework/pull/5950
2016-09-05 18:46:00 +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
Daniel Hensby
c754882e0a
Merge branch '3.3' into 3.4
2016-08-23 10:58:24 +01:00
Daniel Hensby
ba5e51c422
Merge branch '3.2' into 3.3
2016-08-23 10:55:13 +01:00
Daniel Hensby
3820a26abd
Simplifying ModelAsControllerTest setUp
2016-08-22 19:41:11 +01:00
Damian Mooyman
2352127fe0
Apply SilverStripe\Admin namespace
2016-08-16 11:13:32 +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
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