tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
1,196 Commits 31 Branches 527 Tags 162 MiB
43d6ac89e9
Commit Graph

1196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Rickerby
b6dbeec30d initial tweaks to Form to better support use in template control blocks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50988 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-13 01:39:57 +00:00
Ingo Schommer
d21d2a07f9 #2283 Permissions are a bit broken - what happened to all the CMS permissions? 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50950 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:34:27 +00:00
Ingo Schommer
c35ae17168 #2310 MemberTableField Popup breaks after saving 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:24:59 +00:00
Ingo Schommer
02064ce611 BUGFIX fixed csv export in MemberTableField by checking for valid database columns when building SELECT statement 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50945 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:23:53 +00:00
Ingo Schommer
8e884437fe FEATURE added hasDatabaseField() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50942 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:21:49 +00:00
Ingo Schommer
c5d538c366 Merged revisions 50947 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r50947 | ischommer | 2008-03-12 21:53:28 +1300 (Wed, 12 Mar 2008) | 1 line
  
  BUGFIX properly setting $childID in form for newly created items to avoid duplicates after subsequent saving (the form reloaded without the ID connection)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50941 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 08:54:24 +00:00
Geoff Munn
9ff0dde675 $isPlain flag added to the parseVariables function 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50932 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 04:19:39 +00:00
Sam Minnee
b946ee9bb0 Blocked revisions 50916 via svnmerge 
................
  r50916 | sminnee | 2008-03-12 11:54:27 +1300 (Wed, 12 Mar 2008) | 17 lines
  
  Merged revisions 50641,50645,50815 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
  
  ........
    r50641 | mrickerby | 2008-03-06 14:21:47 +1300 (Thu, 06 Mar 2008) | 1 line
    
    fixing typo in parameter name $validate --> $validator
  ........
    r50645 | mrickerby | 2008-03-06 15:06:47 +1300 (Thu, 06 Mar 2008) | 1 line
    
    made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on
  ........
    r50815 | mrickerby | 2008-03-11 10:48:13 +1300 (Tue, 11 Mar 2008) | 1 line
    
    fixing bug with in-memory child objects not having their parent ID field updated via the ->add() method
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50910 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 22:54:56 +00:00
Sam Minnee
9c1c5f5c2f Merged revisions 50903 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50903 | sminnee | 2008-03-11 17:29:06 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2302 - Fixed double-escaping of CTF popup page-navigation links
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 04:30:14 +00:00
Sam Minnee
e9cb7638f7 Blocked revisions 50845 via svnmerge 
................
  r50845 | ischommer | 2008-03-11 13:43:23 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  Merged revisions 50844 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/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/sapphire/trunk@50888 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:30:05 +00:00
Sam Minnee
157c8dc204 Blocked revisions 50841 via svnmerge 
................
  r50841 | ischommer | 2008-03-11 13:40:37 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  Merged revisions 50840 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r50840 | ischommer | 2008-03-11 13:40:25 +1300 (Tue, 11 Mar 2008) | 1 line
    
    fixed PHP notices
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50887 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:30:02 +00:00
Sam Minnee
628f015399 Blocked revisions 50839 via svnmerge 
................
  r50839 | ischommer | 2008-03-11 13:39:59 +1300 (Tue, 11 Mar 2008) | 9 lines
  
  Merged revisions 50838 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r50838 | ischommer | 2008-03-11 13:39:44 +1300 (Tue, 11 Mar 2008) | 1 line
    
    fixed PHP notices
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50886 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:55 +00:00
Sam Minnee
4bbead3aa6 Merged revisions 50814 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50814 | ischommer | 2008-03-11 10:37:31 +1300 (Tue, 11 Mar 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50885 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:49 +00:00
Sam Minnee
bfc51aa63f Merged revisions 50812 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/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/sapphire/trunk@50884 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:36 +00:00
Sam Minnee
b8262b6d48 Merged revisions 50783 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50783 | sminnee | 2008-03-10 16:02:12 +1300 (Mon, 10 Mar 2008) | 1 line
  
  Added 'anchor' option to link inserter
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:30 +00:00
Sam Minnee
557abf6e60 Merged revisions 50723 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50723 | ischommer | 2008-03-08 14:57:05 +1300 (Sat, 08 Mar 2008) | 1 line
  
  added database indexes for AuthorID and PublisherID
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:22 +00:00
Sam Minnee
66cb7ba13b Blocked revisions 50710 via svnmerge 
................
  r50710 | ischommer | 2008-03-07 16:09:36 +1300 (Fri, 07 Mar 2008) | 9 lines
  
  Merged revisions 50697 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
  
  ........
    r50697 | ischommer | 2008-03-07 14:17:14 +1300 (Fri, 07 Mar 2008) | 1 line
    
    #2265 Installer falsely claims modrewrite fails (mamp)
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50881 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:10 +00:00
Sam Minnee
092c47d100 Blocked revisions 50709 via svnmerge 
........
  r50709 | ischommer | 2008-03-07 16:09:28 +1300 (Fri, 07 Mar 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-50047" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50880 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:14:35 +00:00
Sam Minnee
05dc1eee2c Merged revisions 50683 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50683 | aoneil | 2008-03-07 11:05:27 +1300 (Fri, 07 Mar 2008) | 2 lines
  
  #2295 - DataObjectSets cannot be iterated over multiple times concurrently
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50871 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:43 +00:00
Sam Minnee
a0be727cc3 Merged revisions 50488 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50488 | sminnee | 2008-03-03 21:59:09 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2280 - Fixed XML parsing errors in CTF
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50870 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:38 +00:00
Sam Minnee
11074f013f Merged revisions 50487 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50487 | sminnee | 2008-03-03 21:57:26 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2287 - Removed notice-level error when geoip's not installed
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50869 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:30 +00:00
Sam Minnee
ab7fbbb350 Merged revisions 50352 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50352 | sminnee | 2008-02-28 13:47:38 +1300 (Thu, 28 Feb 2008) | 1 line
  
  #2277 - Fixed notice-level error on controllers that are direct subclasses of controller
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50868 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:31:24 +00:00
Sam Minnee
87b936af25 Merged revisions 50290 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50290 | sminnee | 2008-02-27 17:36:18 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Added support for password and old_password encryption mechanisms if you're using MySQL
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50867 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:49 +00:00
Sam Minnee
6d87a6f188 Merged revisions 50245 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50245 | sminnee | 2008-02-27 11:38:55 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Small fix for session bugs on Lightspeed server
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50866 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:42 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:36 +00:00
Sam Minnee
d7196a438c Merged revisions 50200 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50200 | sminnee | 2008-02-26 14:42:29 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Fixed password emailing for edited members
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50864 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:29 +00:00
Sam Minnee
1dd8c7f07c Merged revisions 50180 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50180 | sminnee | 2008-02-26 12:03:24 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Allow use of  on controller extensions
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:19 +00:00
Sam Minnee
ecec061408 Merged revisions 50179 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50179 | sminnee | 2008-02-26 12:03:10 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  Fixed 4.1-sort-by-group-aggregate query rewriter for sort functions containing columns, eg, ORDER BY if(A,B,C), X  
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50862 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:29:14 +00:00
Sam Minnee
9392c0fdb2 Removed notice-level error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50844 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:01:54 +00:00
Ingo Schommer
44bec8c587 updated en_US master entities 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50837 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 00:43:07 +00:00
Ingo Schommer
5c76b90fb7 fixed PHP notices 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50833 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 00:40:25 +00:00
Ingo Schommer
ed520fe9df fixed PHP notices 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 00:39:44 +00:00
Ingo Schommer
bba9bb623e 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/sapphire/trunk@50817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-10 23:55:57 +00:00
Mark Rickerby
f55ba36a65 fixing bug with in-memory child objects not having their parent ID field updated via the ->add() method 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50808 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-10 21:48:13 +00:00
Ingo Schommer
5a313be83e Merged revisions 50805 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/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/sapphire/trunk@50802 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-10 21:28:35 +00:00
Ingo Schommer
cce30493a6 removed random debug methods 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50741 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-09 22:52:02 +00:00
Ingo Schommer
265528a67c #2306 Attempt to unset static property File:: 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50729 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-09 05:08:08 +00:00
Ingo Schommer
0972eb0a95 Initialized merge tracking via "svnmerge" with revisions "1-50048" from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50705 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-07 03:20:10 +00:00
Ingo Schommer
844fe81cca removed alternative_instance_get() (only used for gallery-hack) 
refactored query-caching in instance_get() to just cache the raw db fields (unlikely to change) - overzealous caching was causing problems with wrong SQL selects on subsequent calls

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-07 03:19:49 +00:00
Ingo Schommer
4dd4bc41a6 #2265 Installer falsely claims modrewrite fails (mamp) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50690 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-07 01:17:14 +00:00
Mark Rickerby
0a543a9ae1 made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50638 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-06 02:06:47 +00:00
Mark Rickerby
79835098b0 fixing typo in parameter name $validate --> $validator 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50634 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-06 01:21:47 +00:00
Sam Minnee
848631558e Updated widget system to support forms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50479 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-03 08:48:52 +00:00
Sam Minnee
59d8a1ce8e Improving API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-02 23:24:10 +00:00
Sam Minnee
a0fb07d8ba Added /SapphireInfo URL with some basic version information 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-02 23:21:58 +00:00
Matt Peel
db1932b57c Fixed typo in Email.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50240 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 22:47:01 +00:00
Ingo Schommer
e3994942d3 Merged revisions 50182 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50182 | ischommer | 2008-02-26 13:36:52 +1300 (Tue, 26 Feb 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50187 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 01:23:19 +00:00
Ingo Schommer
acef8b8859 Merged revisions 50189 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50189 | ischommer | 2008-02-26 14:14:33 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  BUGFIX using namespaced sessions in choose_site_lang() (different modes for 'site' and 'cms') to avoid unwanted changes to the application state (e.g. saving of an english cms-form to spanish record because frontend was switched to spanish in the meantime)
  BUGFIX changed choose_site_lang() to use combined if-blocks for $langsAvailable (longer statements, but less redundancy)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50186 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 01:22:52 +00:00
Ingo Schommer
490fc2b2f1 Merged revisions 50188 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50188 | ischommer | 2008-02-26 14:07:33 +1300 (Tue, 26 Feb 2008) | 1 line
  
  setting Director::set_site_mode() (similiar to ContentController) - required for Translatable::choose_site_lang() to work properly
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50185 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 01:22:29 +00:00
Ingo Schommer
e22b87774d Initialized merge tracking via "svnmerge" with revisions "1-47424" from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50183 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-26 01:20:59 +00:00