Commit Graph

1272 Commits

Author SHA1 Message Date
Sam Minnee
ff5caad6ce Fixed manifestbuilder test so as not to confuse the real manifest builder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-30 22:00:16 +00:00
Sam Minnee
df474f0467 Refactored ManifestBuilder for better testability
Added initial ManifestBuilderTest

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51682 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-26 09:23:51 +00:00
Sam Minnee
7eea3c091f Added tests for RSSFeed
Don't require  information on objects passed to RSSFeed

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-21 05:58:50 +00:00
Sam Minnee
3d83f43eff Fixed i18n bug on safe mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51503 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-20 03:00:49 +00:00
Ingo Schommer
8d4f0d006f Merged revisions 51477 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51477 | ischommer | 2008-03-20 09:51:02 +1300 (Thu, 20 Mar 2008) | 1 line
  
  BUGFIX Can't properly deprecate URL() over getURL(), as it takes priority in ViewableData::__get() (which in turn is used by template accessors like $MyImage.Thumbnail.URL) - returning getURL() instead now
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:51:49 +00:00
Sam Minnee
3014401e11 Merged revisions 51462 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51462 | sminnee | 2008-03-19 18:01:55 +1300 (Wed, 19 Mar 2008) | 1 line
  
  Make Object::hasMethod() and Object::__call() case-insensitive, and added tests for it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:39:07 +00:00
Sam Minnee
3f8a2a95c2 Merged revisions 51461 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51461 | sminnee | 2008-03-19 17:27:06 +1300 (Wed, 19 Mar 2008) | 1 line
  
  Test for hasMethod
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:58 +00:00
Sam Minnee
3bb3065c84 Merged revisions 51459 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51459 | sminnee | 2008-03-19 17:25:30 +1300 (Wed, 19 Mar 2008) | 1 line
  
  Fixes to TestRunner for latest PHPUnit/PHP
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:52 +00:00
Sam Minnee
b0c994306d Blocked revisions 51445 via svnmerge
................
  r51445 | sminnee | 2008-03-19 16:26:39 +1300 (Wed, 19 Mar 2008) | 13 lines
  
  Merged revisions 51150-51151 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
  
  ........
    r51150 | sminnee | 2008-03-17 15:04:58 +1300 (Mon, 17 Mar 2008) | 1 line
    
    API CHANGE Allow for tests that don't use the database - don't define a static SapphireTest::
  ........
    r51151 | sminnee | 2008-03-17 15:09:32 +1300 (Mon, 17 Mar 2008) | 1 line
    
    Fixed typo in r51150
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:45 +00:00
Sam Minnee
f88a481026 Merged revisions 51436 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51436 | sminnee | 2008-03-19 15:58:05 +1300 (Wed, 19 Mar 2008) | 2 lines
  
  Fixed HomepageForDomain behaviour when entering multiple domains
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51464 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:41 +00:00
Ingo Schommer
e7a683c0c4 Merged revisions 51257 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51257 | ischommer | 2008-03-18 12:50:03 +1300 (Tue, 18 Mar 2008) | 2 lines
  
  ENHANCEMENT Deprecated Image->URL(), changed to Image->getURL() to be consistent with File class
  FEATURE File->getAbsoluteURL()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51251 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 23:50:18 +00:00
Ingo Schommer
1b5b3f8627 Merged revisions 51246 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51246 | ischommer | 2008-03-18 11:50:47 +1300 (Tue, 18 Mar 2008) | 1 line
  
  ENHANCEMENT findOrMake() now deals with absolute paths and replaces leading/trailing slashes before checking for existing folder objects in the database
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 22:51:25 +00:00
Sam Minnee
9d025c213a BUGFIX Update RestfulService so that it still functions if Curl-SSL isn't set up properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 09:11:24 +00:00
Sam Minnee
9ec3e2fd6e Merged revisions 51203 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r51203 | sminnee | 2008-03-17 21:07:01 +1300 (Mon, 17 Mar 2008) | 3 lines
  
  API CHANGE Added RestfulService::httpHeader() for setting custom headers on REST requests
  API CHANGE Added RestfulService::basicAuth() for setting authentication for REST requests
  API CHANGE Added  param to RestfulService::connect(), to allow for requesting of multiple URLs from a single RestfulService object.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51210 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:25:07 +00:00
Sam Minnee
c21f1ed948 Blocked revisions 50971 via svnmerge
................
  r50971 | ischommer | 2008-03-13 11:06:30 +1300 (Thu, 13 Mar 2008) | 16 lines
  
  Merged revisions 50824 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/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/sapphire/trunk@51209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:52 +00:00
Sam Minnee
d2b642a825 Blocked revisions 50958 via svnmerge
................
  r50958 | ischommer | 2008-03-12 22:34:48 +1300 (Wed, 12 Mar 2008) | 9 lines
  
  Merged revisions 50957 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r50957 | ischommer | 2008-03-12 22:34:27 +1300 (Wed, 12 Mar 2008) | 1 line
    
    #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@51208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:33 +00:00
Sam Minnee
ad38c20d68 Blocked revisions 50955 via svnmerge
................
  r50955 | ischommer | 2008-03-12 22:25:11 +1300 (Wed, 12 Mar 2008) | 9 lines
  
  Merged revisions 50954 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/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/sapphire/trunk@51207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:27 +00:00
Sam Minnee
1a12e67607 Blocked revisions 50953 via svnmerge
................
  r50953 | ischommer | 2008-03-12 22:24:07 +1300 (Wed, 12 Mar 2008) | 9 lines
  
  Merged revisions 50952 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r50952 | ischommer | 2008-03-12 22:23:53 +1300 (Wed, 12 Mar 2008) | 1 line
    
    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@51206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:21 +00:00
Sam Minnee
fb8954eb2c Blocked revisions 50950 via svnmerge
................
  r50950 | ischommer | 2008-03-12 22:22:47 +1300 (Wed, 12 Mar 2008) | 9 lines
  
  Merged revisions 50949 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r50949 | ischommer | 2008-03-12 22:21:49 +1300 (Wed, 12 Mar 2008) | 1 line
    
    FEATURE added hasDatabaseField()
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:15 +00:00
Sam Minnee
d500a32098 Merged revisions 50921 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50921 | sminnee | 2008-03-12 12:49:44 +1300 (Wed, 12 Mar 2008) | 1 line
  
  Make RSS feed work with objects that don't support AbsoluteLink, such as the forum
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 08:24:08 +00:00
Sam Minnee
bd473aa749 Fixed currency's support for scientific notatio
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51164 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 03:03:43 +00:00
Sam Minnee
397bb5fcc2 #2323: Fix casting of negative currency values; add CurrencyTest unit testing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 02:10:23 +00:00
Sam Minnee
4848d0bdb9 Fixed typo in r51150
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 02:09:32 +00:00
Sam Minnee
20e2391224 API CHANGE Allow for tests that don't use the database - don't define a static SapphireTest::
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-17 02:04:58 +00:00
Ingo Schommer
0d49845a73 ENHANCEMENT HiddenFields() now returns FieldSet rather than concatenated HTML string
BUGFIX renamed genExtraFields() to getExtraFields(), now returns a FieldSet rather than adding to $this->fields automatically (allows for external control and inspection)
BUGFIX adding fields from getExtraFields() in Fields()
ENHANCEMENT changed visibility of getExtraFields to public
BUGFIX removed $action->unsetthis() in unsetActionByName
ENHANCEMENT remove $securityTokenAdded flag (unnecessary state, can be determined by inspecting fieldset)
ENHANCEMENT documentation, coding conventions, removed debug code

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-16 22:15:04 +00:00
Mark Rickerby
43ab200ee9 added more readable output for error messages and exceptions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-16 22:13:31 +00:00
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