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,572 Commits 29 Branches 403 Tags 28 MiB
dd6a86c1c1
Commit Graph

357 Commits

Author SHA1 Message Date
Ingo Schommer
dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Paul Meyrick
93bf3029c3 Minor Moved ContentController template from sapphire/templates/ to cms/template in cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
6e60314006 MINOR Adding classes and markup necessary to style tree before jstree.js loads 2011-03-22 18:43:39 +13:00
Ingo Schommer
d22e80b1bd MINOR Replaced hardcoded URLs in LeftAndMain.Tree.js with data-url-* attributes 2011-03-22 18:43:38 +13:00
Ingo Schommer
bfd4737aae BUGFIX Remove EmulateIE7 <meta> tag from LeftAndMain.ss (mainly in order to get rendering compatibility with jstree.js) 2011-03-22 18:43:38 +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
Ingo Schommer
bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:50 +13:00
Ingo Schommer
0c177bcbca MINOR Removed unused MemberList templates (see MemberTableField) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113278 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:49 +13:00
Ingo Schommer
95a917e04d MINOR Translations in CMSMain_left.ss 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108442 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:46 +13:00
Ingo Schommer
5c84e5b0f1 MINOR Removed trailing slash in BackURL, fixed error message sentence structure in PageCommentInterface.ss (fixes #5520) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106694 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:43 +13:00
Will Rossiter
58a92cf456 BUGFIX: fixed select all link using incorrect function 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:40 +13:00
Will Rossiter
fac64e9aa5 BUGFIX: fixed incorrect include path 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105833 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:40 +13:00
Ingo Schommer
df869f9da7 BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105665 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:40 +13:00
Ingo Schommer
fa0bf8c571 MINOR Updated TableListField sublcass template to work with new TableListField->SelectOptions() setting 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105273 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:39 +13:00
Ingo Schommer
13995d710a MINOR Fixed _t() call in PageCommentInterface.ss 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:39 +13:00
Ingo Schommer
166d6f421f ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:38 +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
Ingo Schommer
8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:35 +13:00
Ingo Schommer
4ff657e03f MINOR Translations in PageCommentInterface.ss (fixes #5598, thanks Pike) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104970 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:35 +13:00
Ingo Schommer
38e1a09fb8 BUGFIX Wrong HTML syntax in LeftAndMain.ss (fixes #5552, thanks simon_w) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104403 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:33 +13:00
Luke Hudson
cbc0b0a849 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:33 +13:00
Ingo Schommer
db44725062 BUGFIX login BackURL wrong when using nested urls (fixes #5520, thanks ktauber) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103933 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:32 +13:00
Carlos Barberis
ebea43ebd8 ENHANCEMENT: added language (Ticket #5390) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:26 +13:00
Will Rossiter
a3e8e4e60d BUGFIX: fixed invalid HTML output from page comments template 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102320 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:26 +13:00
Sean Harvey
c8945d9819 BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101375 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:17 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:53:16 +13:00
Ingo Schommer
0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation. 
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:58 +13:00
Ingo Schommer
8302f97ffc FEATURE set file metadata on upload. (from r97780) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:50 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:49 +13:00
Sam Minnee
f9769c5b0a MINOR set Print flag correctly on TLF 
MINOR custom print template for SSReport TLF's that exposes the report title, and filters set (from r97138)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98208 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:38 +13:00
Sam Minnee
d05c921226 BUGFIX: Add horizontal scrolling to reports when necessary. (from r96075) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98183 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:35 +13:00
Sam Minnee
cc89bc68e9 BUGFIX: Don't throw an error if there are no report filters. 
ENHANCEMENT: Allow for custom generation of SSReport::ID() for parameterised reports.
MINOR: Added SSReport::dataClass() accessor.
BUGFIX: Don't randomise the order of reports with the same priority. (from r95955)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98180 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:34 +13:00
Sam Minnee
a6308abc71 MINOR: Added missing template from r95815 (from r95822) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98174 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:33 +13:00
Will Rossiter
da57175a2d MINOR: visual tweaks to the widgets area including widget titles can now be spread over multiple lines and padding between columns. #4965 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98032 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:30 +13:00
Sean Harvey
e9cd3eba62 ENHANCEMENT Added visual elements to aid in the usability of the WidgetAreaEditor 
MINOR Added better help text underneath "Available Widgets" and "Widgets currently used"


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97602 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:28 +13:00
Ingo Schommer
16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels 
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:27 +13:00
Sean Harvey
334beaeedd BUGFIX Clicking available widgets now applies only to h3 elements 
BUGFIX Widgets are now prepended to the available widget stack by use of Insertion.Top 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97541 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:27 +13:00
Sean Harvey
d02f174f42 BUGFIX When adding a new widget by clicking one of the available widgets, add it to the top of the currently used widgets instead of the bottom 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97522 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:26 +13:00
Sean Harvey
c9bf87fd1a MINOR Changed wording for WidgetAreaEditor.TOADD advising users to "click" instead of drag widgets 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97511 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:25 +13:00
Sean Harvey
f5e5461fd2 MINOR Fixed default wording of WidgetAreaEditor.TOADD "drag them here from the left" 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:24 +13:00
Sean Harvey
ed4204b7fa BUGFIX Fixed incorrect lables "TOADD" etc in WidgetAreaEditor 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97507 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:24 +13:00
Ingo Schommer
2ccc3235fb BUGFIX Attribute escaping in PageCommentInterface?_singlecomment.ss (merged from r97071) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97073 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:21 +13:00
Sam Minnee
f1bac8fd67 ENHANCEMENT: Renamed Author column to User in the page version history to better reflect that they might not have been authors, and just iniators of workflow actions. (from r89015) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96793 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:13 +13:00
Sam Minnee
430f30b7c4 MINOR more fix around batch action parameters (from r88837) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96788 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:12 +13:00
Sam Minnee
b14404922d ENHANCEMENT: Files and images section warns if you are deleting a file that is linked to 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:11 +13:00
Will Rossiter
19670e7b27 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95418 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:09 +13:00
Tom Rix
2d3365f7b2 MINOR make widgetarea/editor more suitable for generic use 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:08 +13:00
Ingo Schommer
ce3365d095 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:04 +13:00
Tom Rix
5c8628e7d4 MINOR added stubs to allow widgets to use treedropdown fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:03 +13:00