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
2,617 Commits 29 Branches 403 Tags 28 MiB
8af9c546cf
Commit Graph

74 Commits

Author SHA1 Message Date
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
Ingo Schommer
77e3067eb9 BUGFIX: Check for SubsiteReportWrapper class, not Subsite, so the CMS still works with older versions of Subsites (from r98257) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:36:28 +00:00
Ingo Schommer
0cecb21f50 API CHANGE: Introduced new API for SS_Report (from r98215) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105855 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:34:37 +00:00
Ingo Schommer
95346c7a36 MINOR added broken links report (from r96139) (from r98187) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105834 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:28:38 +00:00
Ingo Schommer
82a4860190 ENHANCEMENT: Removed broken links reports from sidebar (in anticipation of adding them to the main reporting area) (from r95954) (from r98179) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105829 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:24:49 +00:00
Ingo Schommer
0389e784b2 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) (from r98176)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105827 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 02:23:10 +00:00
Ingo Schommer
cf4fa3a23f <a ... /> tag which is not so nice (from r96926) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 06:58:32 +00:00
Sean Harvey
760ee29f7c BUGFIX: Fix default inclusion of (theme|project)/css/editor.css into the WYSWIWYG editor. (from r94350) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95647 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 05:58:37 +00:00
Sean Harvey
c2403fc8c9 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) (from r94062)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95642 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 05:54:10 +00:00
Ingo Schommer
e3a51fe6b9 MINOR Bugfixes for SWFUpload 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92853 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:19 +00:00
Andrew O'Neil
b2eb234669 BUGFIX: Remove blockquote from tinymce default plugin list - blockquote isnt a plugin in tinymce3. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90051 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-23 02:24:09 +00:00
Steve Wake
ee340bc99e Patched to allow id|class|style|title attributes in all elements and allow empty td cells (will pad with non-breaking space) in line with #4332 and 4497 in 2.3.x changes to cms/LeftAndMain.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86655 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-18 02:26:09 +00:00
Will Rossiter
244fc8d64a ENHANCEMENT: added tinymce valid element to allow style, ids and classes on any element to allow for styling hooks. Ticket: #4455 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85736 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-04 03:02:07 +00:00
Sam Minnee
a16ae60d59 API CHANGE: Refactor CMSMenu internals to not generate the menu item list until its actually needed, rather than from a CMSMenu::populate_menu() call in cms/_config.php. This lets an app/_config.php file actually manipulate the menu. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84523 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-17 05:27:46 +00:00
Andrew O'Neil
089483b2f4 NOTFORMERGE: Merged 84085 from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84090 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-10 04:34:17 +00:00
Sean Harvey
8ef5e5c0b4 API CHANGE Removed @deprecated 2.3 ReportField_Controller rule from cms/_config.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77388 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-20 07:09:10 +00:00
Sean Harvey
8625e3bce3 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77067 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-18 05:31:22 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 06:11:18 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:17:59 +00:00
Sam Minnee
ab776401db Static caching merges from dnc branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@68901 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-15 01:31:01 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-04 22:38:58 +00:00
Sam Minnee
2ee0c0991b Merged branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-18 01:48:50 +00:00
Sam Minnee
c2fe5b15ae FEATURE #594: Added javascript-on-demand support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 04:31:53 +00:00
Ingo Schommer
2cdf57053f FEATURE Added CMSMenu and CMSMenuItem and adjusted existing LeftAndMain subclasses to use new notation.See #2872 (thanks to hamish for the patch!) 
API CHANGE Removed LeftAndMain::add_menu_item(), LeftAndMain::remove_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::clear_menu()
MINOR Disabled LeftAndMainTest, now covered by CMSMenuTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65095 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-02 21:27:55 +00:00