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
4,911 Commits 29 Branches 403 Tags 28 MiB
dc8d4ffe0b
Commit Graph

146 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Loz Calver
d637141487 FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) 2016-01-11 16:44:55 +00: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
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
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
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
Damian Mooyman
8e3f549b19 BUG Fix regressions in CMS from db field changes 2015-09-28 17:22:44 +13:00
Damian Mooyman
6c17397322 BUG block adding children from archived pages 
Fixes #1260
 2015-08-24 15:16:09 +12: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
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
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
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
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