tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
6,469 Commits 29 Branches 403 Tags 28 MiB
72f8e5f71d
Commit Graph

808 Commits

Author SHA1 Message Date
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
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