tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-13 16:29:13 +02:00
Code Issues Projects Releases Wiki Activity
5,395 Commits 29 Branches 397 Tags 25 MiB
eb06646aa8
Commit Graph

97 Commits

Author SHA1 Message Date
Damian Mooyman
dfe25c27f0
BUG Fix allowedChildren() and link tracking 2017-02-28 15:46:07 +13:00
UndefinedOffset
8bd5349e42 BUGFIX: Fixed issue on windows where the CMS_DIR constant would be set containing a backslash causing a crash in the cms 2016-11-04 13:29:22 -03:00
Sam Minnee
d946a3b240 FIX: Allow CMS_DIR at the root. 
CMS_DIR is now inferred from the file location and may be at the
project root.
 2016-10-28 17:47:53 +13: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
041d12129a
Fix regressions from namespacing 
Update template locations
Add permission codes to cms sections
Code, phpdoc, and typehint cleanup
Split batch actions into files
 2016-08-16 11:56:34 +12: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
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
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
David Craig
1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Will Rossiter
18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Andrew O'Neil
1722f00869 APICHANGE: add_extension() is now called directly on the class, instead of on Object 2012-11-07 11:08:36 +13:00
Hamish Friedlander
563e0cfc05 BUGFIX: Make CMSes Director rules use new yaml config fragments system 2012-05-19 14:43:10 +12:00
Ingo Schommer
6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry 
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
 2012-04-17 22:59:08 +02:00
Julian Seidenberg
3222e2de4f MINOR: removing report registration as now no longer necessary 2012-04-10 10:46:07 +12:00
Simon Welsh
2f8148d0c0 MINOR Move definition of CMS_DIR and CMS_PATH into cms/_config.php 2012-03-24 11:57:49 +13:00
Ingo Schommer
908a98b55b API CHANGE Default to /admin/pages rather than homepage edit view when CMS is first opened (#6762) 2012-01-24 14:20:55 +01:00
Ingo Schommer
60129f61da ENHANCEMENT Added new CMSFileAddController 2012-01-09 21:21:12 +01:00
Ingo Schommer
213cfb031e MINOR Added routing for AssetAdmin to cms/_config.php (required for GridField?) 2012-01-09 11:38:10 +01:00
Ingo Schommer
0d008b6496 ENHANCEMENT Allowing to add pages from main interface, in addition to dialog triggered from admin/pages (through CMSPageAddController) 2011-12-20 17:45:07 +01:00
Ingo Schommer
bf8bc1d856 MINOR Added CMSPageHistoryController, CMSPageReportsController, marked placeholders for new functionality in AssetAdmin 2011-04-30 16:49:36 +12:00
Ingo Schommer
2e2e312da9 ENHANCEMENT Splitting up CMSMain into CMSPageEditController and CMSPageSettingsController 2011-04-28 22:49:32 +12:00
Ingo Schommer
c1d5e9baa7 API CHANGE Removed SideReport_ToDo report and "To-do" tab on SiteTree, please use the new silverstripe-page-todo module instead 2011-04-28 22:48:55 +12:00
ajshort
6462c59f0f API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension. 
MINOR: Replaced references to decorators with extensions.
 2011-04-15 19:37:15 +10:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
7b038db3be MINOR Moved FileLinkTracking feature into new SiteTreeFileDecorator class in order to move it from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
16d818c201 MINOR Added ModelAsController director rule from 'sapphire' module to cms/_config.php 2011-03-28 09:02:42 +13:00
Paul Meyrick
ed36c62291 Minor moved default setting of ShortcodeParser::get from sapphire module _config to cms module _config 2011-03-28 09:02:20 +13:00
Sam Minnee
3498e41b0a Merge branch '2.4' 
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
 2011-02-15 11:50:24 +13:00
Saophalkun Ponlu
ee4e748803 MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:48 +13:00
Sean Harvey
43c568ef12 MINOR Removed unncessary end PHP tag from cms/_config.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108246 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:45 +13:00
Ingo Schommer
fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:35 +13:00
Sam Minnee
44f22fd880 BUGFIX: Removed erroneous default config for unused templates module. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:33 +13:00
Andrew O'Neil
06007f4455 BUGFIX: Check for SubsiteReportWrapper class, not Subsite, so the CMS still works with older versions of Subsites 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98257 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:39 +13:00
Sam Minnee
983849449e API CHANGE: Introduced new API for SS_Report 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98215 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:39 +13:00
Sam Minnee
dee3b20ccd MINOR added broken links report (from r96139) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98187 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:36 +13:00
Sam Minnee
0ffe4f7d5e MINOR: Correct sidebar report order. (from r96090) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98186 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:36 +13:00
Sam Minnee
49244234d4 ENHANCEMENT: Removed broken links reports from sidebar (in anticipation of adding them to the main reporting area) (from r95954) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98179 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:34 +13:00
Sam Minnee
a5753ad5ef API CHANGE: Removed SideReport class, use SSReport as the base-class for them instead. 
API CHANGE: Use SSReport::register(SideReport) to explicitly register reports on the LHS of the content view.
BUGFIX: Updated all cms side reports to use SSReport as the base class. (from r95884)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98176 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:33 +13:00
Luke Hudson
8b082d3bed <a ... /> tag which is not so nice 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96926 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:19 +13:00
Sam Minnee
f17dd0c37e BUGFIX: Fix default inclusion of (theme|project)/css/editor.css into the WYSWIWYG editor. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94350 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:07 +13:00
Ingo Schommer
a8fdcbd967 ENHANCEMENT Loading of tinymce_ssbuttons plugin via relative paths in HtmlEditorConfig rather than using the plugin name as a path spec (see r94060) 
API CHANGE Changed cms/javascript/tinymce_ssbuttons plugin name to "ssbuttons" (see r94060)
API CHANGE Changed cms/javascript/tinymce_ssmacron plugin name to "ssmacron" (see r94060)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94062 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:06 +13:00
Normann Lou
cbda994c67 BUGFIX: fix bug that can't find tinymce_ssbuttons under sapphire/thirdpaty. this is a change merged from r92853 http://open.silverstripe.org/changeset/92853#file3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93955 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Normann Lou
0b115b2723 BUGFIX: fix bug that can't find tinymce_ssbuttons under sapphire/thirdpaty. this is a change merged from r92853 http://open.silverstripe.org/changeset/92853#file3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93950 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:05 +13:00
Will Rossiter
6d0c79c839 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 05:43:08 +00:00
Sam Minnee
6bab1cfa0a MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian (from r111875) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112808 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:04:15 +00:00
Ingo Schommer
2bdf183521 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr) (from r104987) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112462 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:48:00 +00:00
Ingo Schommer
f0cef54a00 BUGFIX: Removed erroneous default config for unused templates module. (from r104436) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:33:57 +00:00
Ingo Schommer
f3dbe12602 MINOR Merge error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105869 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:47:33 +00:00