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

1049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Minnee
2203c4e0f7 Blocked revisions 52623 via svnmerge 
................
  r52623 | sminnee | 2008-04-13 17:01:54 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  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@53444 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:22:28 +00:00
Sam Minnee
43e7ab66ac Blocked revisions 52622 via svnmerge 
................
  r52622 | sminnee | 2008-04-13 17:01:41 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  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@53443 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:22:20 +00:00
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