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
1,133 Commits 29 Branches 403 Tags 28 MiB
3f9fd08ceb
Commit Graph

1133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
d56432c170 Blocked revisions 52619 via svnmerge 
........
  r52619 | sminnee | 2008-04-13 17:00:30 +1200 (Sun, 13 Apr 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-52058" from 
  http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53442 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:22:03 +00:00
Sam Minnee
63d0642e9b Blocked revisions 52059 via svnmerge 
........
  r52059 | sminnee | 2008-04-03 11:40:15 +1300 (Thu, 03 Apr 2008) | 1 line
  
  Added govtsecurity branch, for making security enhancements compatible with the NZ e-government guidelines
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53441 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:21:56 +00:00
Sam Minnee
0346a1d803 Initialized merge tracking via "svnmerge" with revisions "1-52055" from 
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/govtsecurity


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53439 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:21:19 +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
722458f32c MINOR moved newsletter locales to module 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-17 11:18:09 +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
ea1b6cd66e moved LeftAndMain test from sapphire to cms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52183 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:38:27 +00:00
Ingo Schommer
2a2264ced4 update from translate.silverstripe.com 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52177 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 02:30:55 +00:00
Ingo Schommer
64390985a0 update from translate.silverstripe.com 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52176 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 02:24:43 +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
ca8f721db2 removed folder 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-05 03:51:50 +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
1d6857d1e8 moved "statistic" module images in module path 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52170 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-05 03:37:57 +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
d662f9692d changed mesq merge tracking 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52151 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:49:46 +00:00
Ingo Schommer
44aeab1505 Initialized merge tracking via "svnmerge" with revisions "1-52156" from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52150 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:47:51 +00:00
Ingo Schommer
f615eb13ec Initialized merge tracking via "svnmerge" with revisions "1-52014" from 
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/roa


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52008 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-02 02:05:19 +00:00
Sam Minnee
70ae3df828 Blocked revisions 51004 via svnmerge 
................
  r51004 | sminnee | 2008-03-13 16:23:48 +1300 (Thu, 13 Mar 2008) | 9 lines
  
  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/trunk@51202 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 08:23:15 +00:00
Sam Minnee
af17714965 Blocked revisions 51003 via svnmerge 
................
  r51003 | sminnee | 2008-03-13 16:23:15 +1300 (Thu, 13 Mar 2008) | 9 lines
  
  Blocked revisions 50191 via svnmerge
  
  ........
    r50191 | ischommer | 2008-02-26 14:21:57 +1300 (Tue, 26 Feb 2008) | 3 lines
    
    Initialized merge tracking via "svnmerge" with revisions "1-47424" from 
    svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.1-dnc
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@51201 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 08:23:00 +00:00
Sam Minnee
577e789bfd Blocked revisions 50972 via svnmerge 
................
  r50972 | ischommer | 2008-03-13 11:06:44 +1300 (Thu, 13 Mar 2008) | 16 lines
  
  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/trunk@51200 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 08:22:24 +00:00
Sam Minnee
53e97e5537 Blocked revisions 50956 via svnmerge 
................
  r50956 | ischommer | 2008-03-12 22:25:19 +1300 (Wed, 12 Mar 2008) | 9 lines
  
  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/trunk@51199 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-17 08:22:13 +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
Ingo Schommer
48bb2a55bb removed unused autocomplete code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:23:10 +00:00
Sam Minnee
16cd491ded Blocked revisions 50855 via svnmerge 
................
  r50855 | ischommer | 2008-03-11 14:13:47 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  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/trunk@50859 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:23:09 +00:00
Sam Minnee
d3b29292c4 Blocked revisions 50846 via svnmerge 
................
  r50846 | ischommer | 2008-03-11 13:43:32 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  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/trunk@50858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:23:03 +00:00
Sam Minnee
9e96ba91a2 Blocked revisions 50837 via svnmerge 
................
  r50837 | ischommer | 2008-03-11 13:39:25 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  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/trunk@50857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:22:52 +00:00
Sam Minnee
4321528186 Blocked revisions 50835 via svnmerge 
................
  r50835 | ischommer | 2008-03-11 13:38:53 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  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/trunk@50856 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:22:36 +00:00
Sam Minnee
00e22554d9 Blocked revisions 50834 via svnmerge 
........
  r50834 | ischommer | 2008-03-11 13:38:38 +1300 (Tue, 11 Mar 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-50048" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50855 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:21:06 +00:00
Sam Minnee
32024b451c Merged revisions 50812 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50812 | sminnee | 2008-03-11 10:34:32 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2285 - Fixed widget editor
........


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

........
  r50729 | ischommer | 2008-03-08 18:15:18 +1300 (Sat, 08 Mar 2008) | 1 line
  
  fixed typo
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50853 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:20:47 +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
cc11e36249 updated en_US master entities 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50837 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 00:43:07 +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
026c2c1961 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/trunk@50817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-10 23:55:57 +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
Ingo Schommer
b50ca5ca0b Initialized merge tracking via "svnmerge" with revisions "1-50049" from 
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50800 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-10 21:28:00 +00:00
Sam Minnee
a4ecf8938d #2284 - Removed notice-level error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50478 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-03 08:30:44 +00:00
Geoff Munn
265130b4b5 project name changed to epmu 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50462 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-03 03:11:34 +00:00
Sam Minnee
ed096f66fb Merged revisions 50187 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r50187 | aoneil | 2008-02-26 14:01:26 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  Fix incorrect delimiter in CSV export of GenericDataAdmin
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50341 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-28 00:40:31 +00:00
Sam Minnee
2e7c1fd4c9 Merged revisions 48565 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r48565 | sminnee | 2008-01-24 15:32:05 +1300 (Thu, 24 Jan 2008) | 1 line
  
  Added horizontal scrollbar to RHS link treedropdown, for seeing long page titles
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50340 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-28 00:39:20 +00:00
Normann Lou
cf1e205bc6 add feature that a creation form with fields in it will create the new record with those field value 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50247 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 23:19:05 +00:00
Ingo Schommer
d0e6bdfd2c Initialized merge tracking via "svnmerge" with revisions "1-47424" from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.1-dnc


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 01:21:57 +00:00