Commit Graph

749 Commits

Author SHA1 Message Date
Andrew O'Neil
2a04a0a57b Fix YAML many_many/has_many relationships
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47739 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 21:32:13 +00:00
Andrew O'Neil
144f0fc33e YAML comma seperated => lists should work on has_meny relationships as well
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 19:59:00 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Sam Minnee
5ffeb1a4be Removed unnecessary class Staged
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 03:18:45 +00:00
Andrew O'Neil
84a3cd29d0 Fix stack trace on objects that don't extend the Object class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 03:00:38 +00:00
Andrew O'Neil
3ce88a07d9 Merged revisions 47698 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/events

........
  r47698 | sminnee | 2008-01-08 12:11:08 +1300 (Tue, 08 Jan 2008) | 1 line
  
  PDODatabase got the wrong end of the stick - Database::createDatabase() shouldn't need any arguments.  Fixed this in the core class and MySQLDatabase, but PDODatabse still needs fixing.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 02:14:05 +00:00
Andrew O'Neil
5606e9278b Merged revisions 47699 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/events

........
  r47699 | sminnee | 2008-01-08 12:11:28 +1300 (Tue, 08 Jan 2008) | 1 line
  
  Fixed TestRunner
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47709 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 02:12:18 +00:00
Andrew O'Neil
7848fb9c9b Initialized merge tracking via "svnmerge" with revisions "0-46750" from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/events


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 02:11:23 +00:00
Andrew O'Neil
95180448d0 Merged revisions 47155 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1asfonz

........
  r47155 | sminnee | 2007-12-17 11:20:21 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 00:53:54 +00:00
Andrew O'Neil
614f234bce Initialized merge tracking via "svnmerge" with revisions "0-47151" from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1asfonz


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 00:53:27 +00:00
Andrew O'Neil
20544de022 wakeless: #1976 - DataObject queries the database for child elements when it hasn't been serialized
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-07 22:20:50 +00:00
Andrew O'Neil
7f4d2f1218 #1666 - Interface translations don't show in footer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-07 21:58:22 +00:00
Andrew O'Neil
4b9ed4ec6f Fix title and description in RSS feeds
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47681 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-07 19:17:21 +00:00
Andrew O'Neil
ff467f2393 Merged revisions 47479 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r47479 | nlou | 2007-12-21 15:27:16 +1300 (Fri, 21 Dec 2007) | 1 line
  
  add function fieldByName
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 21:55:27 +00:00
Ingo Schommer
895370c038 made breadcrumbs-delimiter configurable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-05 09:05:33 +00:00
Sean Harvey
54de788984 Reversed isset() change which was causing some side effects
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47595 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-04 03:00:33 +00:00
Sean Harvey
241969d97c Fixed PHP notice undefined index - $messageSet['alreadyLoggedIn']
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-04 02:42:28 +00:00
Sean Harvey
2ef6925cd1 Fixed ID undefined PHP notice error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 21:56:08 +00:00
Ingo Schommer
0535f628ff added $popupClass to avoid duplication, getting basedataclass for existing children in DetailForm() (in case we're dealing with different subclasses)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:43:26 +00:00
Ingo Schommer
1589785b18 more solid ID-detection in php()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:42:04 +00:00
Ingo Schommer
b5aaa9b1e2 additional checks before foreach() loop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 00:49:28 +00:00
Ingo Schommer
3a47be1430 fixed PHP notice in implementorsOf
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 00:49:10 +00:00
Ingo Schommer
817f7604c6 #2069 Locale file /lang/en_US.php should exist (Windows)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 00:38:30 +00:00
Andrew O'Neil
c1e0533efc styling for HasManyFileField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47371 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 23:07:42 +00:00
Andrew O'Neil
604ab689e2 Blocked revisions 47373 via svnmerge
................
  r47373 | ischommer | 2007-12-20 10:15:57 +1300 (Thu, 20 Dec 2007) | 9 lines
  
  Merged revisions 47372 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r47372 | ischommer | 2007-12-20 10:15:18 +1300 (Thu, 20 Dec 2007) | 1 line
    
    added esperanto locale
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 22:59:20 +00:00
Ingo Schommer
0ef3c8441b added esperanto locale
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 21:15:18 +00:00
Ingo Schommer
5bda77262f Merged revisions 47334 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47334 | ischommer | 2007-12-19 14:51:52 +1300 (Wed, 19 Dec 2007) | 1 line
  
  fixed typo
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 01:52:11 +00:00
Ingo Schommer
ce5becdcfd Merged revisions 47323 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47323 | ischommer | 2007-12-19 14:33:29 +1300 (Wed, 19 Dec 2007) | 1 line
  
  documentation, added show-on-click functionality, fixed validation for canBeEmpty
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47322 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 01:45:22 +00:00
Ingo Schommer
19da8d0f85 changed svnmerge for mesq-branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47319 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 01:37:15 +00:00
Ingo Schommer
f8b6b35304 Initialized merge tracking via "svnmerge" with revisions "1-47324" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47318 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-19 01:34:45 +00:00
Andrew O'Neil
50b2f7180f Throw a E_USER_NOTICE on use of deprecated functions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47306 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 22:50:23 +00:00
Andrew O'Neil
76d482b2cd Merged revisions 46920 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46920 | ischommer | 2007-12-14 17:39:01 +1300 (Fri, 14 Dec 2007) | 1 line
  
  fixed $
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:31:05 +00:00
Andrew O'Neil
c0342ec70c Blocked revisions 46855,46923,46948,47140,47152,47180,47182,47228 via svnmerge
................
  r46855 | ischommer | 2007-12-14 14:10:01 +1300 (Fri, 14 Dec 2007) | 8 lines
  
  Blocked revisions 46854 via svnmerge
  
  ........
    r46854 | ischommer | 2007-12-14 14:08:57 +1300 (Fri, 14 Dec 2007) | 1 line
    
    added swedish (thanks to Andreas and William!)
  ........
................
  r46923 | ischommer | 2007-12-14 17:39:41 +1300 (Fri, 14 Dec 2007) | 8 lines
  
  Blocked revisions 46854 via svnmerge
  
  ........
    r46854 | ischommer | 2007-12-14 14:08:57 +1300 (Fri, 14 Dec 2007) | 1 line
    
    added swedish (thanks to Andreas and William!)
  ........
................
  r46948 | ischommer | 2007-12-16 17:19:06 +1300 (Sun, 16 Dec 2007) | 8 lines
  
  Blocked revisions 46854 via svnmerge
  
  ........
    r46854 | ischommer | 2007-12-14 14:08:57 +1300 (Fri, 14 Dec 2007) | 1 line
    
    added swedish (thanks to Andreas and William!)
  ........
................
  r47140 | sminnee | 2007-12-17 11:09:03 +1300 (Mon, 17 Dec 2007) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
................
  r47152 | sminnee | 2007-12-17 11:18:25 +1300 (Mon, 17 Dec 2007) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-45943" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.0
................
  r47180 | ischommer | 2007-12-17 15:33:22 +1300 (Mon, 17 Dec 2007) | 1 line
  
  readded svnmerge tracking for trunk
................
  r47182 | ischommer | 2007-12-17 15:39:01 +1300 (Mon, 17 Dec 2007) | 9 lines
  
  Merged revisions 47179 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r47179 | ischommer | 2007-12-17 15:18:28 +1300 (Mon, 17 Dec 2007) | 1 line
    
    Added chinese (taiwan) (thanks to jeff and normann!)
  ........
................
  r47228 | nlou | 2007-12-18 15:11:20 +1300 (Tue, 18 Dec 2007) | 1 line
  
  add deal and dealtag.
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:30:15 +00:00
Andrew O'Neil
33006a53fa Merged revisions 46853 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46853 | ischommer | 2007-12-14 14:06:12 +1300 (Fri, 14 Dec 2007) | 1 line
  
  added swedish (thanks to Andreas and William!)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:25:08 +00:00
Andrew O'Neil
32fa73d39f Merged revisions 46832 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46832 | sminnee | 2007-12-14 11:59:07 +1300 (Fri, 14 Dec 2007) | 1 line
  
  Added augmentDefaultRecords() function, so that DataObjectDecorators can extend requireDefaultRecords.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:24:23 +00:00
Ingo Schommer
8ece5302f7 Merged revisions 37547 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0.1-uplay

........
  r37547 | ischommer | 2007-06-29 12:36:56 +1200 (Fri, 29 Jun 2007) | 1 line
  
  added blocking
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-17 21:49:49 +00:00
Ingo Schommer
4763f2f5c4 Initialized merge tracking via "svnmerge" with revisions "1-33854" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0.1-uplay


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-17 21:45:09 +00:00
Andrew O'Neil
4f244fe221 Fix php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-17 21:39:59 +00:00
Ingo Schommer
030291a884 Added chinese (taiwan) (thanks to jeff and normann!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-17 02:18:28 +00:00
Ingo Schommer
efdff48168 updating czech translation (thanks to GHOPer misakmilan for reviewing!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-16 02:20:06 +00:00
Ingo Schommer
328c222255 fixed $
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46908 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-14 04:35:28 +00:00
Ingo Schommer
3d440467c3 added swedish (thanks to Andreas and William!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-14 01:08:57 +00:00
Andrew O'Neil
de1749f34c Blocked revisions 46805-46806,46809,46812 via svnmerge
................
  r46805 | ischommer | 2007-12-14 11:15:26 +1300 (Fri, 14 Dec 2007) | 9 lines
  
  Merged revisions 45626 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r45626 | ischommer | 2007-11-26 15:18:28 +1300 (Mon, 26 Nov 2007) | 1 line
    
    Adding Portugues (Portugal) translation - thanks to Rui and Anselmo
  ........
................
  r46806 | ischommer | 2007-12-14 11:16:43 +1300 (Fri, 14 Dec 2007) | 9 lines
  
  Merged revisions 46409 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r46409 | ischommer | 2007-12-06 10:38:01 +1300 (Thu, 06 Dec 2007) | 1 line
    
    added language files for italian, russian, slovak
  ........
................
  r46809 | ischommer | 2007-12-14 11:17:24 +1300 (Fri, 14 Dec 2007) | 9 lines
  
  Merged revisions 46489 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r46489 | ischommer | 2007-12-08 15:28:40 +1300 (Sat, 08 Dec 2007) | 1 line
    
    added turkish translation (thanks mustafa, talyan and mustafa)
  ........
................
  r46812 | ischommer | 2007-12-14 11:17:55 +1300 (Fri, 14 Dec 2007) | 9 lines
  
  Merged revisions 46801 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r46801 | ischommer | 2007-12-14 11:10:34 +1300 (Fri, 14 Dec 2007) | 1 line
    
    Added new languages (bulgarian, czech, hungarian, portugues/brazil, slovak, italian, russian, turkish) for 2.2.1 release, removed duplicate entities, sorted by namespace
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:49 +00:00
Andrew O'Neil
8b85ef1ae1 Merged revisions 46468 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46468 | sminnee | 2007-12-07 11:30:35 +1300 (Fri, 07 Dec 2007) | 1 line
  
  Added empty  array to member so that roles can add their own has_one relations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:18 +00:00
Andrew O'Neil
7b0de78a31 Merged revisions 46467 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46467 | sminnee | 2007-12-07 11:28:44 +1300 (Fri, 07 Dec 2007) | 1 line
  
  Added empty  array to member so that roles can add their own has_one relations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:11 +00:00
Andrew O'Neil
f630e571af Merged revisions 46348 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46348 | jshipman | 2007-12-05 12:32:08 +1300 (Wed, 05 Dec 2007) | 1 line
  
  fixed notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:51 +00:00
Andrew O'Neil
fa9a258bd2 Merged revisions 46139 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46139 | aoneil | 2007-12-03 11:28:34 +1300 (Mon, 03 Dec 2007) | 2 lines
  
  #1942 - Object::uninherited() fix for PHP 5.1.2
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:25 +00:00
Andrew O'Neil
6b66c9beff Merged revisions 46074 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46074 | aoneil | 2007-11-30 17:12:47 +1300 (Fri, 30 Nov 2007) | 2 lines
  
  Don't give SecurityID fields a title, as some forms will show it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:07 +00:00
Andrew O'Neil
dfc48d8421 Merged revisions 46001 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46001 | sminnee | 2007-11-29 19:56:52 +1300 (Thu, 29 Nov 2007) | 1 line
  
  Fixed bug with google sitemap on translated site
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:32:53 +00:00
Andrew O'Neil
0aa4a1e71f Merged revisions 45962 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r45962 | jshipman | 2007-11-29 16:47:51 +1300 (Thu, 29 Nov 2007) | 1 line
  
  content controller notice, hyperlink underlining
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:31:58 +00:00