Go to file
Ingo Schommer abe511fd6c Blocked revisions 45976,45979-45981,45983 via svnmerge
................
  r45976 | ischommer | 2007-11-29 17:35:04 +1300 (Thu, 29 Nov 2007) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-45519" from 
  svn://svn.silverstripe.com/open/modules/sapphire/trunk
................
  r45979 | ischommer | 2007-11-29 17:37:35 +1300 (Thu, 29 Nov 2007) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
................
  r45980 | ischommer | 2007-11-29 17:39:16 +1300 (Thu, 29 Nov 2007) | 1 line
  
  removed svnmerge
................
  r45981 | ischommer | 2007-11-29 17:41:04 +1300 (Thu, 29 Nov 2007) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-45691" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
................
  r45983 | ischommer | 2007-11-29 17:42:38 +1300 (Thu, 29 Nov 2007) | 29 lines
  
  Merged revisions 45762-45962 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
  
  ........
    r45762 | aoneil | 2007-11-27 18:10:18 +1300 (Tue, 27 Nov 2007) | 2 lines
    
    #1892 - Image attach from file store broken
  ........
    r45823 | jshipman | 2007-11-28 11:41:56 +1300 (Wed, 28 Nov 2007) | 1 line
    
    Authentication for test wasn't working.
  ........
    r45825 | jshipman | 2007-11-28 11:46:46 +1300 (Wed, 28 Nov 2007) | 1 line
    
    XML parser improvements
  ........
    r45906 | sminnee | 2007-11-29 10:04:51 +1300 (Thu, 29 Nov 2007) | 1 line
    
    Removed hashing algorithms that contained a command to allow for mysqldumps to be run without very weird corruption errors
  ........
    r45944 | sminnee | 2007-11-29 15:38:09 +1300 (Thu, 29 Nov 2007) | 1 line
    
    Moving branches/2.2.0 to branches/2.2.1 in prep for a 'critical bugfix release'
  ........
    r45962 | jshipman | 2007-11-29 16:47:51 +1300 (Thu, 29 Nov 2007) | 1 line
    
    content controller notice, hyperlink underlining
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52149 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-04 22:45:34 +00:00
api Added simple JSON processor 2008-03-31 08:49:27 +00:00
cli Improving API documentation 2008-03-02 23:24:10 +00:00
conf Added SS_DEFAULT_ADMIN_USERNAME/PASSWORD defines to conf/ConfigureFromEnv.php 2008-02-10 22:58:58 +00:00
core Merged revisions 52011 via svnmerge from 2008-04-02 02:07:32 +00:00
css Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
email Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
filesystem Merged revisions 51257 via svnmerge from 2008-03-17 23:50:18 +00:00
forms Merged revisions 51938 via svnmerge from 2008-04-01 01:50:34 +00:00
images styling for HasManyFileField 2007-12-19 23:07:42 +00:00
integration Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
javascript Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
lang updated en_US master entities 2008-03-11 00:43:07 +00:00
misc Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
parsers Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
profiler Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
search Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
security Merged revisions 50487 via svnmerge from 2008-03-11 01:31:30 +00:00
synchronise Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
templates Merged revisions 50488 via svnmerge from 2008-03-11 01:31:38 +00:00
testing Merged revisions 51459 via svnmerge from 2008-03-19 20:38:52 +00:00
tests Added first cut of RestfulServer - simple get support 2008-03-30 23:18:04 +00:00
tools Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
widgets Merged revisions 50812 via svnmerge from 2008-03-11 03:29:36 +00:00
_config.php Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
cli-script.php Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
main.php Added first cut of RestfulServer - simple get support 2008-03-30 23:18:04 +00:00
main.php5 Reverted geoffm's accidental commit to /open 2008-02-25 02:10:37 +00:00
Makefile Added note about Makefile so that people don't think they should use that for normal installation. 2008-01-16 23:47:53 +00:00
silverstripe_version fixed $ 2007-12-14 04:35:28 +00:00