Blocked revisions 46230-46260 via svnmerge

mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
................
  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
This commit is contained in:
Ingo Schommer
2008-04-15 09:50:35 +00:00
parent 676a0632ea
commit e98210ff28
Blocked revisions 46230-46260 via svnmerge

Diff Content Not Available
