a9c479f26a
API Allow SiteTree::Link to be extended
2017-09-05 08:58:47 +12:00
04f795c665
Tweak add form to use React TreeDropdownField
...
Enhancement Shift groups in SiteTree to use TreeMultiselectField
2017-09-04 13:38:14 +12:00
f2e22ef18a
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 09:46:46 +12:00
d469a2dc88
Fix regressions from tinymce upgrade ( #1923 )
2017-08-15 11:05:56 +12:00
4f6af36369
Manual fixes to automatic namespacing
2017-08-09 17:09:28 +12:00
9f268a18b5
Run add-namespace command
2017-08-09 17:00:58 +12:00
6cb2077878
Move files to new location
2017-08-09 16:58:07 +12:00
2c54e33106
API Virtual pages now respect cascade_deletes on source page
2017-08-09 10:56:08 +12:00
53a0206b1d
BUGFIX check if parent context is SiteTree instance
...
fixes #1913
2017-07-28 14:02:29 -05:00
0758f66932
Merge branch '3' into 4
2017-07-25 14:54:33 +01:00
0a867b4786
Adjust behat step usage
2017-07-25 12:57:46 +12:00
db5f81d393
Fix behat tests
2017-07-25 12:57:46 +12:00
8e2695f140
Merge branch '3.5' into 3.6
2017-07-18 15:44:13 +01:00
6fc1491f0b
Enhancement Add edit command and its url test for page insert
2017-07-18 13:11:58 +12:00
e8c77463c5
FIX Use injection for CMSMain in tests
2017-07-18 10:56:13 +12:00
52ada8bb92
Merge pull request #1898 from robbieaverill/pulls/4.0/remove-config-update
...
FIX Use merge or set instead of update for config calls
2017-07-18 09:14:48 +12:00
515a7cb569
FIX Make sure VirtualPage renders correct templates
2017-07-17 20:13:13 +01:00
6422866f40
Merge pull request #1894 from robbieaverill/pulls/4.0/fix-settings-tab-states
...
FIX Ensure tab states are reflected when switching on page edit screen
2017-07-17 13:21:33 +01:00
c3cda42b92
FIX Use merge or set instead of update for config calls
2017-07-17 17:49:03 +12:00
4bc1bd64fc
Add tests for page level edit and view permission settings
2017-07-17 13:31:14 +12:00
9bde76bad0
Add behat test for toggling between active tabs in CMS edit pages
2017-07-16 23:42:09 +12:00
4c1dbd402b
NEW Change "only these people" to "only these groups" in permissions
2017-07-03 21:39:53 +12:00
99f9d4a2d3
Fix assertions
2017-06-30 14:23:37 +12:00
522af3f29d
FIX: Test updates to comply with https://github.com/silverstripe/silverstripe-framework/pull/7083
2017-06-29 14:39:28 +12:00
9816efc97f
Merge branch '3'
2017-06-28 15:21:22 +01:00
af1654eda3
BUG Don’t click hidden button
2017-06-27 17:22:21 +12:00
77ec2b90c6
API Removed ErrorPage
...
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
ad347af76f
Fix linter
2017-06-23 11:59:10 +12:00
9936499606
Prevent duplicate page tests failing to race conditions
2017-06-22 14:58:26 +12:00
8cebb2758d
Fix behat issues
2017-06-21 21:04:55 +12:00
c2c75aa9e3
Fix and upgrade all tests
...
Fix link tracking
2017-06-21 16:29:40 +12:00
95e304a4ca
Upgrade usage of global methods
2017-06-20 17:12:18 +12:00
7fe808da29
Update session references
2017-06-20 17:12:18 +12:00
93a185e44a
Update HTMLValue and FormField::create_tag usages
2017-06-16 11:44:36 +12:00
05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update
2017-06-15 12:50:49 +01:00
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
844420df40
Enhancement Translation strings updated
2017-05-31 16:08:54 +12:00
08093ea308
Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy
2017-05-30 22:52:22 +01:00
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
f82f0844c1
API Add insert internal link modal
2017-05-30 11:00:32 +12:00
eaee3b6a8b
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:21:22 +01:00
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:55 +01:00
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-24 23:02:41 +01:00
0abce5e859
Remove object class
2017-05-18 17:13:51 +12:00
eebae1f766
BUG Fix insert link behat command
2017-05-16 16:47:07 +12:00
49e559b08c
API Rename services to match FQN of interface / classes
2017-05-16 15:49:09 +12:00
f3b442e9b4
Fix behat tests for insert link to work with react implementation
2017-05-16 11:45:15 +12:00
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
df100b8798
API Upgrade to behat 3
2017-05-05 17:19:41 +12:00
6fb1012eb8
Ran upgrader for lang files
2017-04-27 11:43:04 +12:00
7e77753274
FIX intl test
2017-04-21 15:17:47 +01:00
2225af75c3
Update RedirectorPageTest
2017-04-20 11:16:14 +12:00
9cad8ba01b
Fixed linting
2017-04-12 08:21:02 +12:00
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
72cbf83507
Test fixes for upstream changes
2017-03-30 15:37:22 +01:00
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
c7d9947976
Update SearchFormTest
2017-03-13 11:45:29 +13:00
f65a164818
Update SearchForm
...
Fix RedirectorPageTest
2017-03-10 15:04:02 +13:00
2fafff084f
Fix history comparison fields will now show diff properly, rather than escaped html diff
2017-02-28 16:26:11 +13:00
8766a4c91b
Cleanup unit test classes
2017-02-28 15:46:19 +13:00
358bb8baec
API Remove insert-media tests (now covered by asset-admin, not cms)
2017-02-27 11:00:10 +13:00
6bae804744
API Use symfony/cache
...
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
945eba8efb
Update CMS for new i18n API
2017-02-09 16:11:11 +13:00
c7214b4dcd
Auto-convert to psr2
2017-01-31 13:59:35 +13:00
fa2b87172c
Upgrade cms for new i18n backend
2017-01-26 11:39:20 +13:00
773c848c0f
FIX Separate PageController fixture into its own file (PSR-2 compat)
2017-01-12 10:05:05 +13:00
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
ebe09393db
Update behat tests for new button styling
2017-01-11 17:36:30 +13:00
947c1fe156
Fix broken unit test
2017-01-11 17:36:30 +13:00
cf3a74ec57
FIX Remove deprecation tests, bump deprecation version to 5.0
2017-01-11 10:02:51 +13:00
0927e54780
API Allow controller discovery without underscore (PSR-2 compliance)
2017-01-11 10:02:51 +13:00
fc45e9e0ab
Fixing tests
2016-12-28 17:24:54 +00:00
916d7f3815
Fixing tests
2016-12-28 17:10:45 +00:00
7a296a541b
Merge branch '3'
2016-12-28 17:00:32 +00:00
bf58c5aef4
API Update to use new form submission handling ( #1691 )
2016-12-09 16:00:46 +13:00
4a1cf3d4fb
Merge branch '3.5' into 3
2016-11-28 14:02:13 +00:00
21d9b7cdf1
Merge branch '3.3' into 3.4
2016-11-28 13:57:38 +00:00
5355831de9
Merge branch '3.2' into 3.3
2016-11-28 13:56:51 +00:00
38070ab2d3
API Update tests to reflect renamed services
2016-11-23 19:28:10 +13:00
b2503ac004
FIX: content authors unable to duplicate top-level pages ( fixes #1685 )
2016-11-22 15:55:28 +00:00
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
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
5bd7662cb4
Merge branch '3'
2016-11-03 15:32:47 +00:00
4bf4fca416
BUG Prevent archived pages from having add to campaign action
...
Fixes #1626
2016-10-31 15:24:07 +13:00
e242af48df
Remove @todo behat test
2016-10-31 10:01:44 +13:00
7d18cda7ee
FIX: Test fixes needed for the new simplified test run structure.
2016-10-28 17:48:51 +13:00
eef14c1afc
FIX: Fix behat tests.
...
Update behat test config for simplified test run.
2016-10-28 17:47:59 +13:00
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
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
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
147181e96f
Merge branch '3.3' into 3.4
2016-10-16 22:42:40 +01:00
bc71f2de01
Merge branch '3.2' into 3.3
2016-10-16 22:42:26 +01:00
12c0f3c1c7
Merge branch '3.1' into 3.2
2016-10-16 22:40:56 +01:00
1ce243ccc1
API Cleaned up versioned status checks
2016-10-06 10:31:25 +13:00
98d95cd707
FIX Sort order for duplicated child pages is now retained
2016-10-03 22:08:05 +01:00
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
62816e1ff8
Refactor VirtualPage, remove VirtualPage_Controller
2016-09-22 14:37:54 +01:00
7751a6cee7
Behat test cases for site tree duplication ( #995 )
2016-09-16 11:44:07 +12:00
2dae4e2adc
Rename SS_ prefixed class names
2016-09-09 11:26:24 +12:00
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
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01:00
a87a857a6e
Upgrade code for framework namespaces
...
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
2016-09-07 16:29:26 +12:00
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
9a812101fb
Update tests
2016-09-05 11:23:12 +12:00
b599095a50
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 23:15:12 +12:00
c754882e0a
Merge branch '3.3' into 3.4
2016-08-23 10:58:24 +01:00
ba5e51c422
Merge branch '3.2' into 3.3
2016-08-23 10:55:13 +01:00
3820a26abd
Simplifying ModelAsControllerTest setUp
2016-08-22 19:41:11 +01:00
2352127fe0
Apply SilverStripe\Admin namespace
2016-08-16 11:13:32 +12:00
4dfa4f4473
Resolve issues with namespacing
2016-08-10 16:09:23 +12:00
5bf364bedb
Apply SilverStripe\CMS namespace
2016-08-10 16:09:23 +12:00
70179c8b87
API Better behaviour for virtualised controller
2016-08-04 14:19:33 +12:00
1ae58bbc82
Merge branch '3'
2016-07-25 14:51:39 +01:00
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
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
0f950800ef
FIX wrongly named themes after themestack API change ( #1548 )
2016-07-15 17:13:53 +12:00
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
dc8d4ffe0b
API Refactor usages of HTMLText -> HTMLFragment
...
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
25e4cad164
API Apply SilverStripe\Security namespace
2016-07-05 15:08:05 +12:00
e378332ff3
API Update for new SilverStripe\ORM namespace
2016-06-24 11:00:21 +12:00
880ce895f5
Support custom table_name and DataObjectSchema
2016-06-14 15:37:41 +12:00
a3d7d986a7
Merge branch '3'
2016-06-13 14:38:08 +01:00
ea81389a18
Merge branch '3.3' into 3.4
2016-06-13 14:35:40 +01:00
19047d1577
Merge branch '3.2' into 3.3
2016-06-13 14:34:12 +01:00
c8976a9d64
Merge branch '3.1' into 3.2
2016-06-13 14:33:35 +01:00
c50bc91772
API Cleanup inconsistent SiteTree::duplicate API
2016-06-13 15:47:47 +12:00
d6a57eb507
Amending redundant test
2016-06-04 23:03:06 +01:00
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
1181cac123
MINOR: Removing camel cased 'Html' references.
2016-05-06 14:31:19 +12:00
1aa5492410
API Cleanup SilverStripeNavigator and CMSPreview
2016-05-02 17:02:37 +12:00
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
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
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
9d62d9d381
FIX Link tracking not escaping `#` Fixes #1409
2016-03-21 15:22:00 +00:00
067d44ac6c
API Update link tracking for image shortcodes
2016-03-21 09:08:31 +13:00
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
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
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
a3ee8b92be
Merge remote-tracking branch 'origin/3.3' into 3
2016-03-07 08:49:47 +13:00
859fd5562f
Behat "insert link" regression
...
See 361c9a03fe62431ea9f3fda200df80470334835f
2016-03-07 08:48:02 +13:00
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
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
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
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
377af292be
Upgrade TinyMCE to 4.x
2016-02-15 14:58:24 +13:00
3cefb2edad
Merge remote-tracking branch 'origin/3'
2016-02-12 15:42:33 +13:00
17ee318d06
API VirtualPage permissions now can be set independently of the mirrored page
2016-01-27 10:01:14 +13:00
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
fb43e59b00
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 09:18:35 +00:00
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
c3e82a4838
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# javascript/lang/src/fi.js
2016-01-19 17:10:41 +13:00
e706b147cc
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-01-19 15:08:33 +13:00
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
e19dfd628b
Add behat coverage to check that file field is reset when adding links
2016-01-11 17:08:28 +00:00
d637141487
FIX: preg_quote() anchors in SiteTreeLinkTracking ( fixes #1359 )
2016-01-11 16:44:55 +00:00
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
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
8ddef0b817
Decouple ErrorPage
2016-01-05 15:00:38 -08:00
54ae002d19
BUG FIx merge regressions in versioned tests
2015-12-22 17:46:07 +13:00
15685d85ab
Merge remote-tracking branch 'origin/3.2' into 3
2015-12-22 14:10:52 +13:00
c50dc06401
API Update ErrorPage to use FilesystemGeneratedAssetHandler
2015-11-26 16:08:14 +13:00
2983d823d1
FIX: Ensure VirtualPage forwards request/response data to virtual controllers ( fixes #1329 )
2015-11-18 09:14:11 +00:00
b26c3a3b4e
Restore deprecated reports
2015-11-10 17:17:56 +13:00
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
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
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
e3a321b306
Merge pull request #1304 from scott1702/update-upload-button
...
Update asset admin toolbar
2015-10-30 10:27:29 +13:00
6dc3fc1f26
Update asset admin toolbar
2015-10-30 10:05:51 +13:00
227e2ba162
API Move ErrorPage to new generated files API
2015-10-23 10:08:51 +13:00
d7dcb41b27
FIX: Remove tab - invalid YAML
2015-10-19 17:10:47 +01:00
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
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
1ea22c766c
Move UI to main assets area
2015-09-29 09:35:28 +13:00
f291c5f365
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-09-28 22:31:31 +13:00
8e3f549b19
BUG Fix regressions in CMS from db field changes
2015-09-28 17:22:44 +13:00
e68a752ac7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-09-09 14:53:48 +12:00
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
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
bf6a84bd2f
Fixing behat regression
2015-08-18 00:34:49 +01:00
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
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
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
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12:00
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
71b23b622c
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-31 14:34:04 +12:00
10b2fdc318
FIX: ContentController::getViewer() not returning all found templates ( fixes #1244 )
2015-07-24 11:50:09 +01:00
a94881372f
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-20 14:14:28 +00:00
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
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
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
3b90fef04f
BUG fix behat tests
...
Fixes #1223
2015-07-01 13:24:44 +12:00
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01:00
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
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
d5c7bf66a2
Fix test regressions
2015-06-19 10:47:19 +12:00
Damian Mooyman
Christopher Joe
Robbie Averill
Nic Horstmeier
Daniel Hensby
Saophalkun Ponlu
Daniel Hensby
Daniel Hensby
Sam Minnee
Jonathon Menz
Ingo Schommer
Simon Erkelens
Uncle Cheese
Ingo Schommer
Loz Calver
Nathan
Paul Clarke
Robbie Averill
Hamish Friedlander
Frank Mullenger
Loz Calver
scott1702
Patrick Nelson
David Craig
Peter Thaleikis
Stephen Shkardoon
Anton Smith