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,825 Commits 29 Branches 403 Tags 28 MiB
7534d75789
Commit Graph

2343 Commits

Author SHA1 Message Date
Damian Mooyman
19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +13:00
Damian Mooyman
b54d2f1f7f Merge pull request #1353 from sb-relaxt-at/1334-sitetree-classdropdown-bugfix 
Adding context parameter to canCreate-check in getClassDropdown
 2016-01-22 17:41:27 +13:00
Daniel Hensby
0a0ac86f5b Merge pull request #1370 from tractorcow/pulls/4.0/defaultclass 
API Refactor out Page default classname hack
 2016-01-21 22:40:33 +00:00
Daniel Hensby
e77cfb5143 Merge pull request #1271 from tractorcow/pulls/4.0/dropdown-cleanup 
API Use new formfields
 2016-01-21 13:00:12 +00:00
Damian Mooyman
c97647078b API Refactor out Page default classname hack 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1932
 2016-01-21 17:16:55 +13:00
Damian Mooyman
abc5556520 BUG Fix legacy breadcrumbs appearing on page save 
Fixes #1358
 2016-01-20 15:29:51 +13:00
Damian Mooyman
7c4e6f4b60 BUG prevent "Home page" being selected when no selection was made 
Fixes #1351
 2016-01-20 14:44:11 +13: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
Damian Mooyman
f4d22d6cfe Merge pull request #1354 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-13 09:30:01 +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
Loz Calver
54e8c71a4d Use setFailover() in ContentController (closes silverstripe/silverstripe-framework#4821) 2016-01-06 15:24:17 +00:00
Jonathon Menz
8ddef0b817 Decouple ErrorPage 2016-01-05 15:00:38 -08:00
Stephan Bauer
b30d33585f BUG Adding context parameter to canCreate-check in getClassDropdown of SiteTree (fixes #1334) 2016-01-05 11:00:43 +01:00
Damian Mooyman
43a855e5b5 Merge pull request #1342 from mejt/3 
Added avoiding unhandled exception from Translatable extension in ContentController
 2015-12-22 16:58:04 +13:00
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +13:00
Mateusz
68dd8cf798 Added avoiding unhandled exception from Translatable extension in ContentController 2015-12-08 08:47:50 +01:00
Damian Mooyman
5353ac5315 API Refactor versioned security into core module 2015-12-02 17:37:35 +13:00
Damian Mooyman
c50dc06401 API Update ErrorPage to use FilesystemGeneratedAssetHandler 2015-11-26 16:08:14 +13:00
Loz Calver
b624eb98f1 FIX: Setting target for unwritten VirtualPage breaks write 
The VirtualPage inherits the ID of the target page, which is undesirable if the VirtualPage hasn’t been written yet - it will trick write() into thinking that the record already exists in the database
 2015-11-18 09:14:16 +00:00
Loz Calver
2983d823d1 FIX: Ensure VirtualPage forwards request/response data to virtual controllers (fixes #1329) 2015-11-18 09:14:11 +00:00
Ingo Schommer
7a5b30a05d Extension hooks for "restore to stage" and "archive" 2015-11-16 10:23:24 +13:00
Damian Mooyman
0cabc22a57 Revert 7e2838c81c 2015-11-11 09:14:39 +13:00
Damian Mooyman
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13:00
Ingo Schommer
21df7069d0 Extension hooks for "restore to stage" and "archive" 2015-11-10 15:30:15 +13:00
Damian Mooyman
369f3dda8d API Remove deprecated ListboxField::setMultiple() 2015-11-09 17:05:31 +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
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
bc669311dd Merge pull request #1297 from patricknelson/issue-586-delete-validation-3.2 
FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary.
 2015-10-16 17:18:16 +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
Patrick Nelson
ff6c0a3160 FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. 2015-10-08 17:48:31 -04:00
Patrick Nelson
785f85047f FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. 2015-10-08 17:38:58 -04:00
Peter Thaleikis
4694763fa5 remove trailing spaces in the codebase 2015-09-29 17:18:03 +13: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
Daniel Hensby
f7985b34f2 Merge pull request #1259 from stevie-mayhew/pulls/get_response 
UPDATE: make all response code use getResponse() method
 2015-09-25 12:23:43 +01:00
Stevie Mayhew
d54e117392 UPDATE: make all response code use getResponse() method 2015-09-25 09:10:24 +12: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
scott1702
c028278957 Update font icons to use new library 2015-08-25 15:08:09 +12:00
Sam Minnée
da348f74e8 Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions 
BUG block adding children from archived pages
 2015-08-24 17:04:46 +12:00
Damian Mooyman
46180f671e Fix missing packages 2015-08-24 16:14:33 +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
7d50e0fac7 Merge branch '3' 
Conflicts:
	.travis.yml
 2015-08-17 14:24:16 +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
3790273ae7 Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
 2015-07-31 15:49:46 +12:00
Damian Mooyman
71b23b622c Merge remote-tracking branch 'origin/3.2' into 3 2015-07-31 14:34:04 +12:00
Jonathon Menz
7041a43684 Moved image thumbnail style rules to Framework 
for consistent styling of image thumbnails in GridFields
 2015-07-30 16:15:35 -07: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
Fred Condo
f9cceaada0 Correct doubly-escaped " marks 
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
 2015-07-01 17:42:26 -07: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
Daniel Hensby
524b36b75c Merge pull request #1213 from nglasl/3.1 
FIX Enforced the published/draft selection for SS reports, which was bein…
 2015-06-24 08:08:37 +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
Stephen Shkardoon
b71a521c21 Fix incorrect permission check on duplicate() 
Will now properly fall back to the canCreate() on the parent
 2015-06-23 16:42:08 +12:00
Devlin
bc4dc5cf79 increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain 2015-06-22 14:15:49 +02: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
04a513b0a8 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 12:00:42 +12:00
Damian Mooyman
8de0106fea Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:35:00 +12:00
Daniel Hensby
0b92a61e51 Updating docs link in default install 
Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")
 2015-06-18 16:47:10 +01:00
Daniel Hensby
e9fde144eb Merge pull request #1201 from scott1702/update-content 
Update default home content
 2015-06-17 15:40:17 +01:00
Damian Mooyman
4aa84f3dd2 API make DataObject::validate public 
See https://github.com/silverstripe/silverstripe-framework/pull/4294
 2015-06-17 15:57:12 +12:00
Damian Mooyman
dd49a888e8 Merge remote-tracking branch 'origin/3' 2015-06-17 15:54:01 +12:00
scott1702
60c68098eb Update default home content 2015-06-17 13:04:29 +12:00
Damian Mooyman
f3e1472493 API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:44:19 +12:00
scott1702
ffb6c38e3d Remove 'Filtered Tree' notification when clearing the filter 2015-06-15 16:54:41 +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
Stan Hutcheon
e2d85b2f88 VirtualPage call init on target controller 2015-06-13 12:38:59 +12:00
Damian Mooyman
3bc76e69fb API Formalise new DataObject::canCreate argument 2015-06-09 11:32:38 +12:00
Damian Mooyman
e99554fc17 Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:11:39 +12: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
Jonathon Menz
dbe2ad4f9f FIX: Folder expansion icons 
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
 2015-05-29 08:43:44 -07:00
Damian Mooyman
c5e0c8f007 API Enable tree filter highlighting 
Decoupling of CMS / Framework
 2015-05-04 17:05:35 +12:00
Stevie Mayhew
7ddf5fa697 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:02 +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
221281dade Merge pull request #1181 from dhensby/pulls/injector-searc-form 
FIX Use SearchForm::create to instantiate SearchForm
 2015-04-29 00:11:52 +12:00
Ingo Schommer
94d354de4a Fixed BacklinkTracking filter usage 
Previous deprecation fixes made this method error out
when called on the root node (ID=0), so when admin/assets is first called.
 2015-04-28 23:34:26 +12:00
Ingo Schommer
812a921072 Merge branch 'pulls/dataobject-relation-updates' of https://github.com/dhensby/silverstripe-cms into dhensby-pulls/dataobject-relation-updates 2015-04-28 23:17:25 +12:00
David Craig
7bdca7f5cc Added a list of pages where a file is used 2015-04-28 13:15:44 +12:00
Stephen Shkardoon
857ade7d1d Refactor ErrorPage to have static file building in a separate method 2015-04-27 11:56:54 +12:00
Nik Rolls
5163690bdc PHPDoc improvements for SiteTree and SiteTreeLinkTracking 
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
 2015-04-20 20:59:52 +12:00
Michael Strong
5ab15da8fe Concat links in "broken links" report (fixes #1117) 
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.

Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118.
Modified by @chillu based on peer review feedback.
 2015-04-19 22:39:57 +12:00
Colin Tucker
02fcf6429b Issue #1150: Removed Save and Delete buttons from regular edit form. 2015-04-17 09:19:15 +10:00
Daniel Hensby
a71f5f99fa FIX Use SearchForm::create to instantiate SearchForm 2015-03-31 17:03:17 +01:00