685 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ingo Schommer	d4f444b644	BUGFIX Changed span.middleColumn to .middleColumn in cms_right.css in preparation for building proper HTML/XHTML nesting in formfields ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59284 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-28 07:41:50 +00:00
Ingo Schommer	0f642e8bbd	BUGFIX Fixed colspan on <td class="actions"> in MemberTableField.ss ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59281 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-28 07:38:38 +00:00
Sam Minnee	84668f8097	git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58984 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-23 04:39:14 +00:00
Sam Minnee	3b602a3390	Added missing semicolons to javascript snippets returned after publish ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58346 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-18 03:40:32 +00:00
Ingo Schommer	bb3c40cdd2	FEATURE (by simon_w) Add LeftAndMain::require_css()/require_javascript/require_themed_css() for easier customization in CMS (patch from #2636) ... ENHANCEMENT Applied LeftAndMain::require_javascript() to blog bbcodehelp.js git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58300 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-17 21:08:35 +00:00
Sam Minnee	6561b9be04	BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-10 23:29:20 +00:00
Sam Minnee	67d4cb7a70	Fixed ImageField file store selector in IE7 ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57763 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-10 23:16:17 +00:00
Ingo Schommer	2c2412267b	Merged revisions 57390 via svnmerge from ... svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron ........ r57390 | ischommer | 2008-07-04 11:06:25 +1200 (Fri, 04 Jul 2008) | 1 line BUGFIX Preventing non-ajax form submit in CMSMain when pressing enter-key inside certain form fields in Firefox - overloaded onsubmit to use CMSForm->save() now ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57388 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-03 23:17:55 +00:00
Ingo Schommer	388e73fef3	Initialized merge tracking via "svnmerge" with revisions "54968" from ... svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57386 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-03 23:14:20 +00:00
Ingo Schommer	00ad968072	Initialized merge tracking via "svnmerge" with revisions "54968" from ... svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57385 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-03 23:12:57 +00:00
Ingo Schommer	6cf87c6a7a	Initialized merge tracking via "svnmerge" with revisions "54968" from ... svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57384 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-07-03 23:10:11 +00:00
Andrew O'Neil	e96f7f1da4	Merged revisions 56671 via svnmerge from ... svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2 ........ r56671 | aoneil | 2008-06-23 10:36:40 +1200 (Mon, 23 Jun 2008) | 2 lines Add scroll bar for results in generic data admin ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56921 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:12:26 +00:00
Andrew O'Neil	48f6aad194	Merged revisions 54959 via svnmerge from ... svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2 ........ r54959 | sminnee | 2008-05-22 18:13:24 +1200 (Thu, 22 May 2008) | 1 line Disable / fix flash uploading ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56920 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:11:58 +00:00
Andrew O'Neil	e24b1bd498	Merged revisions 54472 via svnmerge from ... svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2 ........ r54472 | aoneil | 2008-05-13 21:11:42 +1200 (Tue, 13 May 2008) | 2 lines BUGFIX #2504 - Fixed translation interface not working in CMS ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56919 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:11:36 +00:00
Andrew O'Neil	610a02e08a	Merged revisions 54407 via svnmerge from ... svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2 ........ r54407 | sminnee | 2008-05-13 15:11:59 +1200 (Tue, 13 May 2008) | 1 line Removed references to 'mot' folder in code ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56918 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:11:07 +00:00
Andrew O'Neil	a79cfc2d63	Blocked revisions 54215 via svnmerge ... ........ r54215 | sminnee | 2008-05-09 11:16:07 +1200 (Fri, 09 May 2008) | 1 line #2482 - Fixed newsletter unsubscribe ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56917 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:10:19 +00:00
Andrew O'Neil	cfd892c994	Blocked revisions 53210 via svnmerge ... ........ r53210 | sharvey | 2008-04-22 17:26:56 +1200 (Tue, 22 Apr 2008) | 1 line BUGFIX: Ticket #2449 - Fixed unsubscribe function - because it's extending ContentController without a data record, we have to hack this by using null in the parent::__construct() - This however, should be refactored to have a data record (page in the CMS) ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56916 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:09:40 +00:00
Andrew O'Neil	9ebb2e4de4	Blocked revisions 52434 via svnmerge ... ........ r52434 | sminnee | 2008-04-10 11:25:54 +1200 (Thu, 10 Apr 2008) | 1 line Newsletter import: only send a change notification email if there are changes to be sent ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56915 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-25 04:08:05 +00:00
Sean Harvey	3015bea8dc	ENHANCEMENT Allow subclass of CMSMain to view the SwitchView context for staging/published site links ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56816 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-24 03:22:39 +00:00
Ingo Schommer	a75fadda1b	MINOR Updated translatable strings through i18n/textcollector ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56504 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-18 21:06:35 +00:00
Ingo Schommer	a894ad377d	MINOR Unified @package PHPdoc (added where missing, removed duplicates) ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-15 13:33:53 +00:00
Sean Harvey	9b640f8026	API CHANGE Email_Template class deprecated, Email should be used from now on. ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56144 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-06-12 09:29:05 +00:00
Ingo Schommer	4af9a5b5a2	BUGFIX Re-enabled "Unused files" tab in AssetAdmin (fixed memory problems) ... MINOR Moved getUsedFilesList() and getAssetList() from AssetAdmin to Folder (needed for Folder->getCMSFields()), changed their visibility from private to protected git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55081 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-05-24 05:19:42 +00:00
Ingo Schommer	168b9673d7	BUGFIX getUsedFilesList() now gets single DataObjects one-by-one instead of the whole DataObjectSet of *all* File instances in the database (which is a huge memory hog on each AssetAdmin call) ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55080 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-05-24 05:16:05 +00:00
Ingo Schommer	7c0aa2902f	Blocked revisions 47617 via svnmerge ... ........ r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines refactored upload functionality from File into newly created Upload class added filesize and extension validation to AssetAdmin and FileField deprecated some File functions and attributes moved management function from File to Filesystem and added permission checks deprecated use of File->loadUploaded() ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55073 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-05-24 01:26:07 +00:00
Ingo Schommer	52a96217e9	API CHANGE Removing unfinished deprecated BulkLoader functionality ... git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@54119 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-05-07 04:30:13 +00:00
Sam Minnee	6d6b43b21d	Merged revisions 53216 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r53216 | sharvey | 2008-04-22 18:07:35 +1200 (Tue, 22 Apr 2008) | 1 line FEATURE: added phpdoc comments to the API calls for customising CMS rebranding ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53505 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:42:10 +00:00
Sam Minnee	098052a6b3	Merged revisions 53073 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r53073 | sminnee | 2008-04-21 10:55:34 +1200 (Mon, 21 Apr 2008) | 1 line Fix drag&drop in assets and security ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53504 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:41:12 +00:00
Sam Minnee	cd6f4865a2	Merged revisions 52432 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52432 | sminnee | 2008-04-10 11:19:43 +1200 (Thu, 10 Apr 2008) | 1 line #2378 - Fixed newsletter import ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53503 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:40:44 +00:00
Sam Minnee	91de5fd771	Merged revisions 52399 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving) ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53502 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:40:29 +00:00
Sam Minnee	b76083ee64	Merged revisions 52395 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52395 | sminnee | 2008-04-09 18:07:57 +1200 (Wed, 09 Apr 2008) | 1 line #2388 - Fixed CMS search. ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53501 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:40:00 +00:00
Sam Minnee	3148064a9d	Merged revisions 52393 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52393 | ischommer | 2008-04-09 18:04:23 +1200 (Wed, 09 Apr 2008) | 1 line formatting ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53500 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:39:35 +00:00
Sam Minnee	5aea02ee82	Merged revisions 52392 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52392 | sminnee | 2008-04-09 18:00:12 +1200 (Wed, 09 Apr 2008) | 1 line Upgraded SWFUpload to improve CMS uploads ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53499 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:39:23 +00:00
Sam Minnee	ff10f2c9f7	Merged revisions 52309 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52309 | aoneil | 2008-04-08 14:43:46 +1200 (Tue, 08 Apr 2008) | 2 lines fix comment admin not working correctly ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53498 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:39:10 +00:00
Sam Minnee	4ab91642b3	Merged revisions 52298 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52298 | sminnee | 2008-04-08 12:35:20 +1200 (Tue, 08 Apr 2008) | 1 line Added LeftAndMain::set_loading_image() for replacing the image shown when the CMS is loading ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53497 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:39:00 +00:00
Sam Minnee	e395446f66	Merged revisions 52296 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52296 | aoneil | 2008-04-08 12:28:37 +1200 (Tue, 08 Apr 2008) | 2 lines Fix pagecomment links and feeds ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53496 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:38:48 +00:00
Sam Minnee	83db9bfa3b	Blocked revisions 51973 via svnmerge ... ........ r51973 | sminnee | 2008-04-01 17:28:15 +1300 (Tue, 01 Apr 2008) | 1 line Add scrollbar to RHS link inserter, so you can see everything ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53495 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:37:57 +00:00
Sam Minnee	e0ff08a4b0	Merged revisions 51963 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r51963 | sminnee | 2008-04-01 17:08:14 +1300 (Tue, 01 Apr 2008) | 1 line Fix to anchor insertion ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53494 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:36:52 +00:00
Sam Minnee	deaddc841d	Merged revisions 52875 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity ........ r52875 | sminnee | 2008-04-16 20:12:35 +1200 (Wed, 16 Apr 2008) | 1 line Respect Member validation in the add-record part of MemberTableField ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53457 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:28:33 +00:00
Sam Minnee	0341a8685e	Merged revisions 52797 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity ........ r52797 | sminnee | 2008-04-15 22:22:33 +1200 (Tue, 15 Apr 2008) | 1 line Fixed interaction of MemberTableField and member validation ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53456 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:28:20 +00:00
Sam Minnee	9ca05b3546	Blocked revisions 52796 via svnmerge ... ........ r52796 | sminnee | 2008-04-15 22:22:10 +1200 (Tue, 15 Apr 2008) | 1 line Quick-fix for permissions tab of security - change the dropdown to a textarea ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53455 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:28:04 +00:00
Sam Minnee	3367623015	Merged revisions 52793 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity ........ r52793 | sminnee | 2008-04-15 22:17:48 +1200 (Tue, 15 Apr 2008) | 1 line IP address fields ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53454 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:27:53 +00:00
Sam Minnee	6571a3be05	Merged revisions 52645 via svnmerge from ... http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity ........ r52645 | sminnee | 2008-04-13 17:51:39 +1200 (Sun, 13 Apr 2008) | 1 line Improvements to let people customise the WYSIWYG editor ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53452 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:23:41 +00:00
Sam Minnee	fd12665e6c	Blocked revisions 52630 via svnmerge ... ................ r52630 | sminnee | 2008-04-13 17:03:12 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52434 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52434 | sminnee | 2008-04-10 11:25:54 +1200 (Thu, 10 Apr 2008) | 1 line Newsletter import: only send a change notification email if there are changes to be sent ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53451 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:23:26 +00:00
Sam Minnee	cee9e7f6c2	Blocked revisions 52629 via svnmerge ... ................ r52629 | sminnee | 2008-04-13 17:03:00 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52432 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52432 | sminnee | 2008-04-10 11:19:43 +1200 (Thu, 10 Apr 2008) | 1 line #2378 - Fixed newsletter import ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53450 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:23:16 +00:00
Sam Minnee	5288aa5b12	Blocked revisions 52628 via svnmerge ... ................ r52628 | sminnee | 2008-04-13 17:02:48 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52399 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving) ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53449 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:23:04 +00:00
Sam Minnee	b495f22629	Blocked revisions 52627 via svnmerge ... ................ r52627 | sminnee | 2008-04-13 17:02:34 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52395 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52395 | sminnee | 2008-04-09 18:07:57 +1200 (Wed, 09 Apr 2008) | 1 line #2388 - Fixed CMS search. ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53448 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:22:57 +00:00
Sam Minnee	943bb4f22f	Blocked revisions 52626 via svnmerge ... ................ r52626 | sminnee | 2008-04-13 17:02:25 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52393 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52393 | ischommer | 2008-04-09 18:04:23 +1200 (Wed, 09 Apr 2008) | 1 line formatting ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53447 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:22:50 +00:00
Sam Minnee	76e32a5e6e	Blocked revisions 52625 via svnmerge ... ................ r52625 | sminnee | 2008-04-13 17:02:15 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52392 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52392 | sminnee | 2008-04-09 18:00:12 +1200 (Wed, 09 Apr 2008) | 1 line Upgraded SWFUpload to improve CMS uploads ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53446 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:22:41 +00:00
Sam Minnee	9e7fe45e2c	Blocked revisions 52624 via svnmerge ... ................ r52624 | sminnee | 2008-04-13 17:02:04 +1200 (Sun, 13 Apr 2008) | 9 lines Merged revisions 52309 via svnmerge from http://svn.silverstripe.com/open/modules/cms/branches/2.2.2 ........ r52309 | aoneil | 2008-04-08 14:43:46 +1200 (Tue, 08 Apr 2008) | 2 lines fix comment admin not working correctly ........ ................ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53445 467b73ca-7a2a-4603-9d3b-597d59a354a9	2008-04-26 06:22:35 +00:00