Commit Graph

1098 Commits

Author SHA1 Message Date
Sam Minnee
834da4640d Merged revisions 52618 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52618 | sminnee | 2008-04-13 16:58:15 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Updated tests to make better use of TestViewer
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:52 +00:00
Sam Minnee
efd1cf63e2 Merged revisions 52617 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52617 | sminnee | 2008-04-13 16:57:53 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Updated changed password test to check for a sent email
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:42 +00:00
Sam Minnee
f82b03c74d Merged revisions 52616 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52616 | sminnee | 2008-04-13 16:56:58 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Added email testing support to SapphireTest
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:31 +00:00
Sam Minnee
8cf1fe1efc Merged revisions 52211 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52211 | sminnee | 2008-04-06 19:21:38 +1200 (Sun, 06 Apr 2008) | 1 line
  
  Added TestViewer, which generates documentation from unit test source code
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:16 +00:00
Sam Minnee
a1f8892c52 Merged revisions 52151 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52151 | sminnee | 2008-04-05 11:14:26 +1300 (Sat, 05 Apr 2008) | 1 line
  
  Lock users out after 5 failed log-ins
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:05 +00:00
Sam Minnee
eb60b67732 Merged revisions 52121 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52121 | sminnee | 2008-04-03 22:04:33 +1300 (Thu, 03 Apr 2008) | 4 lines
  
  Added DataObject::validate() for specifying DataObject-level validators.
  Added DataObject::onAfterWrite(), a complement of DataObject::onBeforeWrite()
  Added password strength testing to security system
  Added password expiry to security system
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:52 +00:00
Sam Minnee
031ab93e97 Merged revisions 52120 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52120 | sminnee | 2008-04-03 21:40:18 +1300 (Thu, 03 Apr 2008) | 1 line
  
  Fix operation of Cookie::forceExpiry() during testing.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53464 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:36 +00:00
Sam Minnee
7759de7433 Merged revisions 52119 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52119 | sminnee | 2008-04-03 21:38:21 +1300 (Thu, 03 Apr 2008) | 1 line
  
  Improved operation of Director::test() when accessing ,,, directly.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53463 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:24 +00:00
Sam Minnee
f8589c9677 Blocked revisions 52056 via svnmerge
........
  r52056 | sminnee | 2008-04-03 11:38:50 +1300 (Thu, 03 Apr 2008) | 2 lines
  
  Added govtsecurity branch, for making security enhancements compatible with the NZ e-government guidelines
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:06 +00:00
Sam Minnee
53dc73465d FEATURE Added ability to restrict security groups to IP address ranges.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:27:15 +00:00
Sam Minnee
211563eb27 Initialized merge tracking via "svnmerge" with revisions "1-52055" from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/govtsecurity


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:20:45 +00:00
Sean Harvey
a12cf06cc8 BUGFIX: Ticket #2327 - Merged patch fixing regex problem in Director::protocolAndHost()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 03:30:16 +00:00
Sean Harvey
130ead34cd FEATURE: Ticket #2198 - Merged patch making can() decoratorable by defining augmentCan()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:28:07 +00:00
Sean Harvey
6c342f7db5 FEATURE: Ticket #2408 - Merged patch to Convert::array2json() which makes uses of the PHP function json_encode when available
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:21:03 +00:00
Sean Harvey
081905485f FEATURE: Ticket #2418 - Merged in patch allow setting of currency symbol
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:12:26 +00:00
Sean Harvey
91dacf4d15 BUGFIX: Ticket #2408 - Fixed Geoip breaking when localhost is IPv6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 01:52:09 +00:00
Sean Harvey
4a5443c5da ENHANCEMENT: Ticket #2382 - Merged patch changing 302 for /home to 301
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 01:45:55 +00:00
Sean Harvey
3f50c7a477 BUGFIX: Ticket #2455 - Check variable exists before accessing Password index
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 23:57:04 +00:00
Romain Louis
0a124ec302 isset check replaced by non empty
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 23:21:48 +00:00
Romain Louis
eb018ad36a getParentIdNameRelation bug fixing and cleaning : This function is usefull only for the has_one and has_many relation but useless for many_many
Morerover, it manages well now the child heritage and parent heritage

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 05:29:59 +00:00
Romain Louis
c5c3cf19b6 Save method bugs fixing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 05:19:55 +00:00
Ingo Schommer
1ff396ad21 API CHANGE Removed deprecated/incomplete Synchronise class - please do not use for production purposes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 03:33:24 +00:00
Romain Louis
e91a07d752 Lower case display problem fixing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52996 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 05:02:56 +00:00
Mark Rickerby
ef75418f7b BUGFIX: fixed typo in variable name that was causing payment form validation to break
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52991 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 04:28:37 +00:00
Romain Louis
0d29142f89 Bug fixing on the parse function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52990 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 03:50:29 +00:00
Romain Louis
9e0e9d3238 Join source bug fixing when there is no that table with the exact sourceName
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52983 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-18 03:00:39 +00:00
Ingo Schommer
aaac90c531 API CHANGE Making all parameters to Email::__construct() optional (they all have public setters/getters, don't necessarily need to be set at instanciation time, as used in e.g. NewsletterAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:27:27 +00:00
Ingo Schommer
9612475abf BUGFIX fixed references in getCMSFields() (was still pointing to SecurityAdmin context)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:12:01 +00:00
Ingo Schommer
1e93305699 BUGFIX php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:11:40 +00:00
Ingo Schommer
e98210ff28 Blocked revisions 46230-46260 via svnmerge
................
  r46230 | ischommer | 2007-12-03 21:33:45 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33216 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33216 | ischommer | 2007-04-03 19:05:12 +1200 (Tue, 03 Apr 2007) | 1 line
    
    added $backup_post_data
  ........
................
  r46231 | ischommer | 2007-12-03 21:34:48 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33227 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33227 | hsmith | 2007-04-04 07:30:20 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Merged 2.0-nzct
  ........
................
  r46232 | ischommer | 2007-12-03 21:37:19 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33231 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33231 | hsmith | 2007-04-04 09:37:07 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46233 | ischommer | 2007-12-03 21:37:28 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33234 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33234 | hsmith | 2007-04-04 10:05:27 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Fixed synchronise so that it doesn't try to send objects immediately after receiving them.
  ........
................
  r46234 | ischommer | 2007-12-03 21:37:38 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33235 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33235 | hsmith | 2007-04-04 10:07:55 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Fixed synchronise so that it doesn't try to send objects immediately after receiving them.
  ........
................
  r46235 | ischommer | 2007-12-03 21:37:49 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33239 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33239 | hsmith | 2007-04-04 11:17:52 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Added flag to switch synchronisation to retrieve only
  ........
................
  r46236 | ischommer | 2007-12-03 21:38:02 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33250 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33250 | hsmith | 2007-04-04 12:49:48 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46237 | ischommer | 2007-12-03 21:38:13 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33252 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33252 | hsmith | 2007-04-04 12:53:11 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46238 | ischommer | 2007-12-03 21:38:28 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33264 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33264 | hsmith | 2007-04-04 16:41:55 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Added some debug stuff
  ........
................
  r46239 | ischommer | 2007-12-03 21:38:37 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33265 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33265 | hsmith | 2007-04-04 16:54:56 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Waiting objects now includes classname
  ........
................
  r46240 | ischommer | 2007-12-03 21:39:15 +1300 (Mon, 03 Dec 2007) | 17 lines
  
  Merged revisions 33269-33274 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33269 | hsmith | 2007-04-04 20:32:11 +1200 (Wed, 04 Apr 2007) | 1 line
    
    Synchronised::receiveObject now checks the local installation for the
  ........
    r33270 | hsmith | 2007-04-04 20:35:14 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
    r33273 | ischommer | 2007-04-04 20:38:54 +1200 (Wed, 04 Apr 2007) | 1 line
    
    prepared focusfirstelement
  ........
    r33274 | hsmith | 2007-04-04 20:41:44 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46241 | ischommer | 2007-12-03 21:39:29 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33278 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33278 | hsmith | 2007-04-04 20:43:14 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46242 | ischommer | 2007-12-03 21:39:42 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33290 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33290 | hsmith | 2007-04-04 20:50:45 +1200 (Wed, 04 Apr 2007) | 1 line
  ........
................
  r46243 | ischommer | 2007-12-03 21:39:55 +1300 (Mon, 03 Dec 2007) | 7 lines
  
  Merged revisions 33295 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33295 | hsmith | 2007-04-05 00:25:27 +1200 (Thu, 05 Apr 2007) | 1 line
  ........
................
  r46244 | ischommer | 2007-12-03 21:40:03 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33297 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33297 | hsmith | 2007-04-05 01:08:21 +1200 (Thu, 05 Apr 2007) | 1 line
    
    Fixed
  ........
................
  r46245 | ischommer | 2007-12-03 21:40:37 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 33300 via svnmerge
  
  ........
    r33300 | ischommer | 2007-04-05 08:38:47 +1200 (Thu, 05 Apr 2007) | 1 line
    
    temporarily bypassing TotalCount() (queries not performance-optimizsd
  ........
................
  r46246 | ischommer | 2007-12-03 21:41:47 +1300 (Mon, 03 Dec 2007) | 10 lines
  
  Merged revisions 33370 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33370 | hsmith | 2007-04-05 16:29:55 +1200 (Thu, 05 Apr 2007) | 2 lines
    
    Increased font size for IE6
    Fixed the validationErrors for TableField
  ........
................
  r46247 | ischommer | 2007-12-03 21:41:57 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33405 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33405 | ischommer | 2007-04-10 12:21:53 +1200 (Tue, 10 Apr 2007) | 1 line
    
    automatic replacing of form-tags in load_form() - otherwise this breaks innerHTML-replacing in IE6
  ........
................
  r46248 | ischommer | 2007-12-03 21:44:07 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33411 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33411 | ischommer | 2007-04-10 15:07:48 +1200 (Tue, 10 Apr 2007) | 1 line
    
    fixed ExportButton()-javascript (IE Bug), corrected timestamp in export
  ........
................
  r46249 | ischommer | 2007-12-03 21:45:22 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 33426 via svnmerge
  
  ........
    r33426 | ischommer | 2007-04-10 18:48:48 +1200 (Tue, 10 Apr 2007) | 1 line
    
    changed format from 2-4-7-2 to new extended format 2-4-8-3, and added automatic conversion in loading/saving
  ........
................
  r46250 | ischommer | 2007-12-03 21:45:38 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33529 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33529 | ischommer | 2007-04-12 10:19:42 +1200 (Thu, 12 Apr 2007) | 1 line
    
    formatting
  ........
................
  r46251 | ischommer | 2007-12-03 21:46:57 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Blocked revisions 33530 via svnmerge
  
  ........
    r33530 | ischommer | 2007-04-12 10:20:19 +1200 (Thu, 12 Apr 2007) | 2 lines
    
    formatting,
    added setLeftTitle() to force a left-aligned title in SmallFieldHolder()
  ........
................
  r46252 | ischommer | 2007-12-03 21:47:11 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33552 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33552 | ischommer | 2007-04-12 14:01:09 +1200 (Thu, 12 Apr 2007) | 1 line
    
    mime-types fallback for windows
  ........
................
  r46253 | ischommer | 2007-12-03 21:47:22 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33563 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33563 | ischommer | 2007-04-12 15:55:55 +1200 (Thu, 12 Apr 2007) | 1 line
    
    changed loadMimeTypes() to fallback to internal mimetype-file (if not used on unix-server)
  ........
................
  r46254 | ischommer | 2007-12-03 21:47:33 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33576 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33576 | ischommer | 2007-04-12 17:19:13 +1200 (Thu, 12 Apr 2007) | 1 line
    
    creating a $sourceClass-Objectin sourceItems() and export()
  ........
................
  r46255 | ischommer | 2007-12-03 21:47:43 +1300 (Mon, 03 Dec 2007) | 10 lines
  
  Merged revisions 33587 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33587 | ischommer | 2007-04-12 19:13:42 +1200 (Thu, 12 Apr 2007) | 2 lines
    
    renamed static function joinBankNumber() to join_bank_number(),
    modified convert_format_nz() to optionally accept strings
  ........
................
  r46256 | ischommer | 2007-12-03 21:49:13 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 33626 via svnmerge
  
  ........
    r33626 | ischommer | 2007-04-13 12:22:38 +1200 (Fri, 13 Apr 2007) | 1 line
    
    added query-params to getManyManyComponents()
  ........
................
  r46257 | ischommer | 2007-12-03 21:49:38 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33628 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33628 | ischommer | 2007-04-13 12:28:06 +1200 (Fri, 13 Apr 2007) | 1 line
    
    fixed order of pagination-icons
  ........
................
  r46258 | ischommer | 2007-12-03 21:49:50 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33735 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33735 | ischommer | 2007-04-16 11:26:39 +1200 (Mon, 16 Apr 2007) | 1 line
    
    removed transformation-parameter from performReadonlyTranformation() (inconstent with underlying class, FormField.php)
  ........
................
  r46259 | ischommer | 2007-12-03 21:50:36 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 33736 via svnmerge
  
  ........
    r33736 | ischommer | 2007-04-16 11:26:52 +1200 (Mon, 16 Apr 2007) | 1 line
    
    formatting
  ........
................
  r46260 | ischommer | 2007-12-03 21:50:50 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33771 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33771 | ischommer | 2007-04-16 15:42:12 +1200 (Mon, 16 Apr 2007) | 1 line
    
    removed debug-code, added extraFilter and extraJoin for getUpdatedObjects()
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:50:35 +00:00
Ingo Schommer
676a0632ea Blocked revisions 46220-46228 via svnmerge
................
  r46220 | ischommer | 2007-12-03 21:12:21 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33096 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33096 | ischommer | 2007-04-02 09:29:07 +1200 (Mon, 02 Apr 2007) | 1 line
    
    fixed baseclass-bug in getCSVQuery()
  ........
................
  r46221 | ischommer | 2007-12-03 21:14:46 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33141 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33141 | hsmith | 2007-04-02 16:54:34 +1200 (Mon, 02 Apr 2007) | 1 line
    
    Fixed a bug in Validator.js that caused all fields to show up when onblur event occured.
  ........
................
  r46222 | ischommer | 2007-12-03 21:17:05 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33142 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33142 | hsmith | 2007-04-02 16:55:02 +1200 (Mon, 02 Apr 2007) | 2 lines
    
    Added setting to RequiredFields that allows user to ignore field labels.
  ........
................
  r46223 | ischommer | 2007-12-03 21:18:04 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33145 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33145 | hsmith | 2007-04-02 16:57:29 +1200 (Mon, 02 Apr 2007) | 1 line
    
    Fixed logic that forces error to use "this field" in error message
  ........
................
  r46224 | ischommer | 2007-12-03 21:19:33 +1300 (Mon, 03 Dec 2007) | 10 lines
  
  Merged revisions 33166 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33166 | hsmith | 2007-04-03 08:44:06 +1200 (Tue, 03 Apr 2007) | 2 lines
    
    Added ability to restrict certain records from synchronisation.
    PostBackup creates BACKUP_DIR if it doesn't exist.
  ........
................
  r46225 | ischommer | 2007-12-03 21:20:29 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33167 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33167 | hsmith | 2007-04-03 09:06:15 +1200 (Tue, 03 Apr 2007) | 1 line
    
    Added RTF function to Varchar fieldtype
  ........
................
  r46226 | ischommer | 2007-12-03 21:22:02 +1300 (Mon, 03 Dec 2007) | 10 lines
  
  Merged revisions 33174 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33174 | hsmith | 2007-04-03 11:20:25 +1200 (Tue, 03 Apr 2007) | 2 lines
    
    Can now set an installation to readonly when synchronising.
    Synchronisation connections are always initiated on the same installation.
  ........
................
  r46227 | ischommer | 2007-12-03 21:22:14 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33175 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33175 | hsmith | 2007-04-03 11:22:15 +1200 (Tue, 03 Apr 2007) | 1 line
    
    Fixed read_only
  ........
................
  r46228 | ischommer | 2007-12-03 21:32:20 +1300 (Mon, 03 Dec 2007) | 10 lines
  
  Merged revisions 33207 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33207 | hsmith | 2007-04-03 16:59:13 +1200 (Tue, 03 Apr 2007) | 2 lines
    
    Hacked together a validator for the TableField :/
    Allowed EmailField and NumericField to be empty.
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:34:18 +00:00
Ingo Schommer
ebf0255189 Merged revisions 46229 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-nzct

................
  r46229 | ischommer | 2007-12-03 21:33:00 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33209 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33209 | hsmith | 2007-04-03 17:01:42 +1200 (Tue, 03 Apr 2007) | 1 line
    
    Added message element to template.
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:33:50 +00:00
Ingo Schommer
7e0f0b8432 Blocked revisions 46210-46219 via svnmerge
................
  r46210 | ischommer | 2007-12-03 20:53:49 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32613 via svnmerge
  
  ........
    r32613 | ischommer | 2007-03-22 20:37:44 +1200 (Thu, 22 Mar 2007) | 1 line
    
    Fixed bug in exists()
  ........
................
  r46211 | ischommer | 2007-12-03 20:56:58 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32620 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32620 | sminnee | 2007-03-22 20:53:43 +1200 (Thu, 22 Mar 2007) | 1 line
    
    Memory usage improvements
  ........
................
  r46212 | ischommer | 2007-12-03 20:58:21 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32621 via svnmerge
  
  ........
    r32621 | sminnee | 2007-03-22 20:54:21 +1200 (Thu, 22 Mar 2007) | 1 line
    
    Fixed isDev=1 flag
  ........
................
  r46213 | ischommer | 2007-12-03 21:00:39 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32626 via svnmerge
  
  ........
    r32626 | sminnee | 2007-03-22 22:08:42 +1200 (Thu, 22 Mar 2007) | 1 line
    
    DirectLink export
  ........
................
  r46214 | ischommer | 2007-12-03 21:01:14 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32750 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32750 | ischommer | 2007-03-26 12:26:26 +1200 (Mon, 26 Mar 2007) | 1 line
    
    Fixed past_date()
  ........
................
  r46215 | ischommer | 2007-12-03 21:05:19 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32760 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32760 | ischommer | 2007-03-26 14:09:38 +1200 (Mon, 26 Mar 2007) | 1 line
    
    changed formatting of $sendLiveErrorsTo, added $custom_smtp_server param (should not be hardcoded to mail.silverstripe.com!!)
  ........
................
  r46216 | ischommer | 2007-12-03 21:07:00 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32938 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32938 | ischommer | 2007-03-28 20:42:06 +1200 (Wed, 28 Mar 2007) | 1 line
    
    typo
  ........
................
  r46217 | ischommer | 2007-12-03 21:07:55 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32939 via svnmerge
  
  ........
    r32939 | ischommer | 2007-03-28 20:42:18 +1200 (Wed, 28 Mar 2007) | 1 line
    
    removed debug-code
  ........
................
  r46218 | ischommer | 2007-12-03 21:08:03 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32940 via svnmerge
  
  ........
    r32940 | ischommer | 2007-03-28 20:42:31 +1200 (Wed, 28 Mar 2007) | 1 line
    
    removed debug-code
  ........
................
  r46219 | ischommer | 2007-12-03 21:11:40 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 33038 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r33038 | hsmith | 2007-03-30 10:08:16 +1200 (Fri, 30 Mar 2007) | 1 line
    
    Submitted forms now save data via PostBackup
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:31:36 +00:00
Ingo Schommer
a6f726e2f3 Blocked revisions 46209 via svnmerge
................
  r46209 | ischommer | 2007-12-03 20:52:30 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32553 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32553 | ischommer | 2007-03-21 22:30:21 +1200 (Wed, 21 Mar 2007) | 1 line
    
    Added performReadonlyTransformation() and performDisabledTransformation()
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:28:13 +00:00
Ingo Schommer
2dd3784f24 Blocked revisions 46208 via svnmerge
................
  r46208 | ischommer | 2007-12-03 20:51:01 +1300 (Mon, 03 Dec 2007) | 8 lines
  
  Blocked revisions 32552 via svnmerge
  
  ........
    r32552 | ischommer | 2007-03-21 22:29:55 +1200 (Wed, 21 Mar 2007) | 1 line
    
    Additional check for existing ID in exists()
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:27:02 +00:00
Ingo Schommer
ce47803d54 Blocked revisions 46207 via svnmerge
................
  r46207 | ischommer | 2007-12-03 20:50:06 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32541 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32541 | ischommer | 2007-03-21 21:18:01 +1200 (Wed, 21 Mar 2007) | 1 line
    
    Using buildDataObjectSet() for the sourceItems, added related-field syntax and custom formatting
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:26:17 +00:00
Ingo Schommer
35171f621f Blocked revisions 46206 via svnmerge
................
  r46206 | ischommer | 2007-12-03 20:48:51 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32540 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32540 | ischommer | 2007-03-21 21:17:03 +1200 (Wed, 21 Mar 2007) | 1 line
    
    Disabled writing of $non_ajax_content in update_dom_id() - doesn't make sense (would override if called multiple times)
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:24:33 +00:00
Ingo Schommer
089b95ef7a Blocked revisions 46204 via svnmerge
................
  r46204 | ischommer | 2007-12-03 20:46:50 +1300 (Mon, 03 Dec 2007) | 9 lines
  
  Merged revisions 32258 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32258 | ischommer | 2007-03-15 23:09:17 +1300 (Thu, 15 Mar 2007) | 1 line
    
    Formatting
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:23:41 +00:00
Ingo Schommer
d32f1cea73 Blocked revisions 46203 via svnmerge
................
  r46203 | ischommer | 2007-12-03 20:40:58 +1300 (Mon, 03 Dec 2007) | 53 lines
  
  Merged revisions 32173-32184 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct-postaudit
  
  ........
    r32173 | ischommer | 2007-03-14 23:31:41 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Additional check for SCRIPT_NAME existence before failing environment-check (needed in non-SS environments)
  ........
    r32174 | ischommer | 2007-03-14 23:32:23 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Choose TMP-directory from ENV if present (tempnam() doesn't get a temporary directory in Windows in CLI-mode)
  ........
    r32175 | ischommer | 2007-03-14 23:32:54 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Additional backslash-replace in MANIFEST_FILE (needed for windows-paths)
  ........
    r32176 | ischommer | 2007-03-14 23:33:08 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Documentation
  ........
    r32177 | ischommer | 2007-03-14 23:33:17 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Added past_date()
  ........
    r32178 | ischommer | 2007-03-14 23:33:31 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Formatting
  ........
    r32179 | ischommer | 2007-03-14 23:34:06 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Return title when calling Name(), so we can do removeByName() on "anonymous" fields
  ........
    r32180 | ischommer | 2007-03-14 23:34:20 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Added unsetFieldFromTab()
  ........
    r32181 | ischommer | 2007-03-14 23:34:30 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Formatting
  ........
    r32182 | ischommer | 2007-03-14 23:34:50 +1300 (Wed, 14 Mar 2007) | 1 line
    
    More versatile character-replacing for css-classes
  ........
    r32183 | ischommer | 2007-03-14 23:35:34 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Checking for customSourceItems actually being set (should use them even if set to "false"), TotalCount() respects customSourceItems
  ........
    r32184 | ischommer | 2007-03-14 23:36:41 +1300 (Wed, 14 Mar 2007) | 1 line
    
    Displaying middleColumn inline (switched from span to div because of XHTML-errors and javascript-innerHTML-insertion problems in IE6) , see r32166
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:23:10 +00:00
Ingo Schommer
12c3ab559f Merged revisions 32182 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct

........
  r32182 | ischommer | 2007-03-14 23:34:50 +1300 (Wed, 14 Mar 2007) | 1 line
  
  More versatile character-replacing for css-classes
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:21:45 +00:00
Ingo Schommer
ce8bf58b0d Merged revisions 32179 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct

........
  r32179 | ischommer | 2007-03-14 23:34:06 +1300 (Wed, 14 Mar 2007) | 1 line
  
  Return title when calling Name(), so we can do removeByName() on "anonymous" fields
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:21:25 +00:00
Ingo Schommer
bdeab4d124 changed nzct svnmerge-integrated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52773 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:19:16 +00:00
Ingo Schommer
8a3ab2191c Initialized merge tracking via "svnmerge" with revisions "1-52778" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0-nzct


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-15 09:16:42 +00:00
Mark Rickerby
e12f87ad38 When ClassInfo::dataClassesFor is passed an instance of the class, the method now automatically coerces the instance to a string of its name
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52675 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-14 04:49:08 +00:00
Ingo Schommer
b039104acc Merged revisions 52649 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/roa

........
  r52649 | ischommer | 2008-04-14 10:03:15 +1200 (Mon, 14 Apr 2008) | 1 line
  
  MINOR fixed php notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-13 22:05:03 +00:00
Ingo Schommer
f337b048e5 Merged revisions 50164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-nzct

........
  r50164 | hsmith | 2008-02-26 10:39:54 +1300 (Tue, 26 Feb 2008) | 1 line
  
  API CHANGE: Added DataObject::writeComponents. DataObject::write now has a flag to disable writing of components
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-10 01:43:31 +00:00
Ingo Schommer
37ba118974 BUGFIX removed duplicate definition
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-10 01:43:22 +00:00
Ingo Schommer
ee477b5456 Initialized merge tracking via "svnmerge" with revisions "1-52440" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-nzct


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-10 01:36:00 +00:00
Ingo Schommer
f996d29e5b Merged revisions 51762 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51762 | ischommer | 2008-03-27 17:47:14 +1300 (Thu, 27 Mar 2008) | 1 line
  
  ENHANCEMENT prepared for subclassing groups
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:44:13 +00:00
Ingo Schommer
b38c0d0941 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/sapphire/trunk@52414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:34:10 +00:00