Commit Graph

624 Commits

Author SHA1 Message Date
Andreas Piening 17d19c2de5 MINOR: using better type checking
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@95352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:12 +13:00
Andreas Piening 65d72f947d MINOR: fixed bug for safari on saving an ajax generated form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@95335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:12 +13:00
Sean Harvey bbf7445f66 BUGFIX Removed canEdit() call that doesn't exist in SecurityAdmin::savemember()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@73347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Sean Harvey 634f1816ff BUGFIX Using $allowed_actions in ImageEditor (Merged from r73248)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@73282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Sean Harvey f5968dd06f BUGFIX Using auto-escaped get_by_id() in CommentAdmin and SecurityAdmin (Merged from r73247)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@73271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Sam Minnee 1b4dd66e40 Removed some notice-level errors in reporting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@72259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Michael Andrewartha d32ed5c5d7 forced tinymce to keep iframes in html rather then deleting them
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@69440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Andrew O'Neil c2cf68836b Make sure only fields that exist can be autocompleted on MemberTableFields, and never autocomplete on password. (merged from branches/2.3)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@66552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Andrew O'Neil 8e938c3f25 Fixed error on CommentAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@66479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Andrew O'Neil 183a7fd2c1 MINOR: Fix php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@65765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:11 +13:00
Andrew O'Neil d294181fe8 Fix accept button in CommentAdmin not working
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@64640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:10 +13:00
Andrew O'Neil 1d3658fa4b Fix CMS export
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@64639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:09 +13:00
Josh Kosmala d0b9b919bd Allow updating of File detail CMS fields by defining updateCMSFields in a decorator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2@64353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:56:09 +13:00
Sam Minnee 636220e63c Disable / fix flash uploading
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@54952 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Andrew O'Neil 35511143bc BUGFIX #2504 - Fixed translation interface not working in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@54465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee 5b8564e5e9 Removed references to 'mot' folder in code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@54400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee ab70f6c200 #2482 - Fixed newsletter unsubscribe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@54208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sean Harvey 33130b344f FEATURE: added phpdoc comments to the API calls for customising CMS rebranding
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@53209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sean Harvey b84b4c0773 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/branches/2.2.2@53203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee 1a50df714e Fix drag&drop in assets and security
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@53066 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee bec3646148 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/branches/2.2.2@52427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee 10fcb38e05 #2378 - Fixed newsletter import
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Ingo Schommer 109e877c72 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/branches/2.2.2@52392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Sam Minnee a3aed6638c #2388 - Fixed CMS search.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:30 +13:00
Ingo Schommer ed4636ec5f formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Sam Minnee 7c71f3430e Upgraded SWFUpload to improve CMS uploads
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Andrew O'Neil c7d0e688c7 fix comment admin not working correctly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Sam Minnee 2670c97983 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/branches/2.2.2@52291 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Andrew O'Neil c52e340aa8 Fix pagecomment links and feeds
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@52289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Sam Minnee 8558204a47 Add scrollbar to RHS link inserter, so you can see everything
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@51966 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Sam Minnee de69da1093 Fix to anchor insertion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@51956 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Sam Minnee aa8b544dc0 Merged revisions 50852 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk

........
  r50852 | sminnee | 2008-03-11 14:02:05 +1300 (Tue, 11 Mar 2008) | 1 line
  
  Added delete from stage button to CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:29 +13:00
Ingo Schommer 307e0d0c97 Merged revisions 50824 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50824 | ischommer | 2008-03-11 12:55:57 +1300 (Tue, 11 Mar 2008) | 8 lines
  
  Added Translations for Danish (Denmark) - thanks to Jesper and Dennis
  Added Translations for Esperanto - thanks to Wojtek, Donald, Evan and Joop
  Added Translations for Finnish (Finland) - thanks to Elias, Vesa and Nina
  Added Translations for LOLCAT - thanks to Wojtek
  Added Translations for Sinhalese (Sri Lanka) - thanks to Nivanka, Himali and Lakshan
  Updated several translations in cms/auth_openid/sapphire
  Added package names for i18n files
  Reverted patch from r47694 which introduced conditional statements in lang-files
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50965 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:28 +13:00
Ingo Schommer da65329934 Merged revisions 50954 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50954 | ischommer | 2008-03-12 22:24:59 +1300 (Wed, 12 Mar 2008) | 1 line
  
  #2310 MemberTableField Popup breaks after saving
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:28 +13:00
Ingo Schommer 0d29c86029 Merged revisions 50854 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50854 | ischommer | 2008-03-11 14:13:28 +1300 (Tue, 11 Mar 2008) | 1 line
  
  reverted r49775 (accidental removal of "add" feature, its actually not redundant functionality)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:28 +13:00
Ingo Schommer eb60e67536 Merged revisions 50844 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50844 | ischommer | 2008-03-11 13:43:07 +1300 (Tue, 11 Mar 2008) | 1 line
  
  updated en_US master entities
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:28 +13:00
Ingo Schommer cc39159050 Merged revisions 50836 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50836 | ischommer | 2008-03-11 13:39:15 +1300 (Tue, 11 Mar 2008) | 1 line
  
  formatting, fixed PHP notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50830 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:28 +13:00
Ingo Schommer f0c2e73ddb Merged revisions 50829 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/trunk

........
  r50829 | ischommer | 2008-03-11 13:22:47 +1300 (Tue, 11 Mar 2008) | 1 line
  
  fixed PHP notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Sam Minnee 605dbb3026 #2285 - Fixed widget editor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50805 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Ingo Schommer dcacadd404 added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
fixed weird indentation formatting in Member.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Ingo Schommer e5e9bcf540 fixed typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Sam Minnee ef148d0d7d Fixed newlines in to-do report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Sam Minnee 0d042c27f3 Fixed CMS bottom-navigation after publish, when using the subsites module (or other alternateAbsoluteLink implementors)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2@50198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:27 +13:00
Sam Minnee f640e12242 Fixed notice level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 04:44:56 +00:00
Sam Minnee f7474bf059 Added to main CMS controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:41:33 +00:00
Sam Minnee 6546f66ebb Added deprecation note to BulkLoaderAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:38:41 +00:00
Sam Minnee c9fc1ea46b Merged revisions 48425 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48425 | sminnee | 2008-01-22 17:16:41 +1300 (Tue, 22 Jan 2008) | 3 lines
  
  Updated AssetAdmin to use TreeTitle() in place of Title for tree generation
  > Updated TreeTitle() to allow use of alternateTreeTitle() in decorator
  > Updated File to allow the insertion of extra columns by decorator
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:24:13 +00:00
Sam Minnee 29d9896dcf Merged revisions 48401 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48401 | sminnee | 2008-01-22 14:27:13 +1300 (Tue, 22 Jan 2008) | 2 lines
  
  Updated core to allow for subsites restriction of filesystem: Folder::getCMSFields() is now responsible for generating the folder form.
  Folder::syncChildren() now exclusively uses DB::query() calls instead of DataObject::get().
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:23:57 +00:00
Sam Minnee 0c2a44d15c Merged revisions 48376 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r48376 | sminnee | 2008-01-22 10:52:32 +1300 (Tue, 22 Jan 2008) | 1 line
  
  Moved CMS page-disabled logic into SiteTree::CMSTreeClasses(), so that it can be more easily customised for specific sites
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:20:22 +00:00
Sam Minnee abba535093 Merged revisions 46526 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r46526 | sminnee | 2007-12-10 15:11:51 +1300 (Mon, 10 Dec 2007) | 1 line
  
  Removed redundant Add Member button at the top-right
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49768 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:18:38 +00:00