Commit Graph

317 Commits

Author SHA1 Message Date
Ingo Schommer
6401ee7eaf (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:53:34 +00:00
Ingo Schommer
9fcc91bcbd (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
08beafbcdb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
2b87d00c13 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
83fff5f1c1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:16:46 +00:00
Ingo Schommer
05ad3c8e1c (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:00:40 +00:00
Hayden Smith
7e791ea681 Merged [47015]: Moved call to DataObject::write and makes use of DataObject::destroy.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 05:01:42 +00:00
Hayden Smith
4144a01e14 Merged [47010]: Modified GenericDataAdmin::buildResultFieldValue to accept relations of the form: obj1.obj2...objN->MethodCall, similar to TableListField_Item.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:50:54 +00:00
Hayden Smith
438b6b5f85 Merged [47007]: Fix to prevent GenericDataAdmin setting a status on a new record and thus overwritting a data field named 'Status'. Includes a fix for onclick on Ajax buttons if event is not passed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:29:32 +00:00
Ingo Schommer
4b5ab8a997 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
5000d0a227 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:43:48 +00:00
Ingo Schommer
e858222ce1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:36:18 +00:00
Ingo Schommer
038bcbb8d9 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +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
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
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
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
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
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
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
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
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
Sean Harvey
909b3487fe FEATURE: Ticket #2321 - Merged patch allowing CMS to be fully rebrandable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 03:19:53 +00:00
Ingo Schommer
b1920529f8 API CHANGE Moving newsletter functionality to its own module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:34:37 +00:00
Ingo Schommer
e607848e9b Merged revisions 51920 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq

........
  r51920 | ischommer | 2008-03-31 21:22:13 +1300 (Mon, 31 Mar 2008) | 1 line
  
  ENHANCEMENT Using static $tree_class to get Groups (allows for custom subclasses)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:46:27 +00:00
Ingo Schommer
1bf68baa26 Merged revisions 51659 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51659 | ischommer | 2008-03-26 15:43:01 +1300 (Wed, 26 Mar 2008) | 1 line
  
  ENHANCEMENT Moved Group field generation from SecurityAdmin->getEditForm() to Group->getCMSFields()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:34:10 +00:00
Ingo Schommer
533aec3815 API CHANGErefactored upload functionality from File into newly created Upload class
API CHANGE deprecated some File functions and attributes
API CHANGE moved management function from File to Filesystem and added permission checks: sync(), loadContent(), fixfiles(), moverootfilesto()
API CHANGE deprecated use of File->loadUploaded()
ENHANCEMENT added filesize and extension validation to AssetAdmin and FileField
FEATURE added tests for Upload class

Merged revisions 47617 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq

........
  r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 08:20:13 +00:00
Ingo Schommer
4b97afea04 API CHANGE Added LeftAndMain::populate_default_menu() and LeftAndMain::clear_menu()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 01:57:31 +00:00
Ingo Schommer
6bfb0ba64a API CHANGE LeftAndMain.php: Removed $extra_menu_items, $replaced_menu_items, $removed_menu_items (all handled in $menu_items now)
API CHANGE Deprecated menu manipulation through Object::addStaticVars(), changed internal representation of menu_item array to always use associative arrays
ENHANCEMENT Added LeftAndMain::add_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::remove_menu_item()
ENHANCEMENT Moved default menu items from LeftAndMain->MainMenu() to cms/_config.php
ENHANCEMENT Added ReportAdmin::has_reports()
ENHANCEMENT Object::addStaticVars() can replace the whole array optionally
ENHANCEMENT Object::stat() optionally returns uncached results
ENHANCEMENT Moved Object::useCustomClass('SSDateTime') from Object.php to sapphire/_config.php
ENHANCEMENT Misc documentation and formatting in LeftAndMain and Object classes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 03:43:58 +00:00
Ingo Schommer
228cd12a28 BUGFIX securing url actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 03:14:02 +00:00
Ingo Schommer
07c58cc90f API CHANGE Moved "statistics" functionality into separate module, which is not distributed with a default silverstripe installation. see r52168
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 01:40:36 +00:00
Ingo Schommer
6511df5ece #2310 MemberTableField Popup breaks after saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 09:24:59 +00:00
Sam Minnee
66b5a963e7 Merged revisions 50361 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50361 | sminnee | 2008-02-28 14:12:53 +1300 (Thu, 28 Feb 2008) | 1 line
  
  Fixed newlines in to-do report
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:37 +00:00
Sam Minnee
2c1b94f355 Merged revisions 50205 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50205 | sminnee | 2008-02-26 15:26:11 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  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/trunk@50851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:24 +00:00
Ingo Schommer
ae88663ee2 reverted r49775 (accidental removal of "add" feature, its actually not redundant functionality)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:13:28 +00:00
Sam Minnee
dcedf0193a Added delete from stage button to CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:02:05 +00:00
Ingo Schommer
e33eb26243 formatting, fixed PHP notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:39:15 +00:00
Ingo Schommer
04854f30d0 fixed PHP notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:22:47 +00:00
Ingo Schommer
ee12df16a4 Merged revisions 50805 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2

........
  r50805 | ischommer | 2008-03-11 10:23:53 +1300 (Tue, 11 Mar 2008) | 2 lines
  
  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/trunk@50801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:28:15 +00:00