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
4,729 Commits 31 Branches 527 Tags 162 MiB
4b2c64c843
Commit Graph

4729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
5e8597bf0a Added TokenisedRegularExpression for accurate parsing of class files for the manifest. To make it efficient, the parse results of each file are now cached. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52320 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-08 06:17:58 +00:00
Sam Minnee
412d76420d Added fixture for UploadTest so that it would create a database 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52319 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-08 06:08:31 +00:00
Ingo Schommer
a4d9521c3f Merged revisions 51944 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51944 | ischommer | 2008-04-01 15:43:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  ENHANCEMENT Using separate <script> tags for each customScript() requirements (necessary e.g. for google analytics inclusion)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-07 21:39:11 +00:00
Sam Minnee
b035abc6d3 #2380 - ManifestBuilder shouldn't recognise class definitions in comments and strings as real 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52239 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-07 04:42:35 +00:00
Ingo Schommer
b465a46bcc API CHANGErefactored upload functionality from File into newly created Upload class 
API CHANGE deprecated some File functions and attributes
API CHANGE moved management function from File to Filesystem and added permission checks: sync(), loadContent(), fixfiles(), moverootfilesto()
API CHANGE deprecated use of File->loadUploaded()
ENHANCEMENT added filesize and extension validation to AssetAdmin and FileField
FEATURE added tests for Upload class

Merged revisions 47617 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq

........
  r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 08:20:13 +00:00
Ingo Schommer
5d1336a5a4 Merged revisions 47616 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47616 | ischommer | 2008-01-04 19:19:06 +1300 (Fri, 04 Jan 2008) | 1 line
  
  wording
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52203 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:10:51 +00:00
Ingo Schommer
c59972a3f8 Blocked revisions 47615 via svnmerge 
........
  r47615 | ischommer | 2008-01-04 19:15:29 +1300 (Fri, 04 Jan 2008) | 1 line
  
  admin permission check in loadcontentall()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52202 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:10:43 +00:00
Ingo Schommer
6e85a576b5 ENHANCEMENT secured URL actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52201 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:09:59 +00:00
Ingo Schommer
72f6f06f44 Merged revisions 47614 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47614 | ischommer | 2008-01-04 19:15:18 +1300 (Fri, 04 Jan 2008) | 1 line
  
  stricter checking in loadUploaded()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52200 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:09:02 +00:00
Ingo Schommer
9e98f127f2 Merged revisions 47613 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47613 | ischommer | 2008-01-04 19:14:58 +1300 (Fri, 04 Jan 2008) | 1 line
  
  adding tabIndex capabilities, switching HTML-rendering to createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52199 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:08:45 +00:00
Ingo Schommer
cb860c2f75 Merged revisions 47612 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47612 | ischommer | 2008-01-04 19:11:57 +1300 (Fri, 04 Jan 2008) | 1 line
  
  formatting, removed saveInto() (same functionality as parent-class)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52198 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:08:03 +00:00
Ingo Schommer
f4998d0b8d BUGFIX improved error checking in saveInto() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52197 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:07:05 +00:00
Ingo Schommer
1b1af23c66 formatting 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52196 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:05:41 +00:00
Ingo Schommer
48193739d3 Merged revisions 47611 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47611 | ischommer | 2008-01-04 19:11:42 +1300 (Fri, 04 Jan 2008) | 1 line
  
  formatting, removed saveInto() (same functionality as parent-class)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52195 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:05:23 +00:00
Ingo Schommer
c0ac37816c Blocked revisions 47610 via svnmerge 
........
  r47610 | ischommer | 2008-01-04 19:10:43 +1300 (Fri, 04 Jan 2008) | 1 line
  
  removed debug-code
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52194 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:04:00 +00:00
Ingo Schommer
caa59b2fce Merged revisions 47609 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47609 | ischommer | 2008-01-04 19:10:25 +1300 (Fri, 04 Jan 2008) | 1 line
  
  fixed validate() (wrong parameters)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52193 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:03:33 +00:00
Ingo Schommer
275e08bee1 Merged revisions 47608 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47608 | ischommer | 2008-01-04 19:09:50 +1300 (Fri, 04 Jan 2008) | 1 line
  
  additional value-checking in createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52192 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:03:15 +00:00
Ingo Schommer
4a7a4dde9e Merged revisions 47520 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47520 | ischommer | 2007-12-23 21:27:48 +1300 (Sun, 23 Dec 2007) | 1 line
  
  added RAWURLATT()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52191 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:02:55 +00:00
Ingo Schommer
b08dba9173 Merged revisions 47505 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47505 | ischommer | 2007-12-22 17:31:58 +1300 (Sat, 22 Dec 2007) | 1 line
  
  fixed maxlength mixups
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52190 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:02:39 +00:00
Ingo Schommer
230e77e712 Merged revisions 47501 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47501 | ischommer | 2007-12-22 17:26:09 +1300 (Sat, 22 Dec 2007) | 1 line
  
  fixed getTabIndex() typo
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52189 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:02:21 +00:00
Ingo Schommer
f737d52138 Merged revisions 47500 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47500 | ischommer | 2007-12-22 17:25:34 +1300 (Sat, 22 Dec 2007) | 1 line
  
  changed field-rendering to use createTag()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52188 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:02:05 +00:00
Ingo Schommer
aa13b78838 Merged revisions 47499 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47499 | ischommer | 2007-12-22 17:23:26 +1300 (Sat, 22 Dec 2007) | 1 line
  
  added tabIndex
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52187 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:01:28 +00:00
Ingo Schommer
2f51144a85 Merged revisions 47488 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47488 | ischommer | 2007-12-21 16:03:04 +1300 (Fri, 21 Dec 2007) | 1 line
  
  in fileExists(): replace any appended query-strings, e.g. /path/to/foo.php?bar=1 to /path/to/foo.php
........

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52186 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 04:00:43 +00:00
Ingo Schommer
15b388640d Merged revisions 47487 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47487 | ischommer | 2007-12-21 16:02:50 +1300 (Fri, 21 Dec 2007) | 1 line
  
  added URLATT()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52185 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:52:57 +00:00
Ingo Schommer
e0f6e50c82 Merged revisions 47414 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47414 | ischommer | 2007-12-20 18:17:40 +1300 (Thu, 20 Dec 2007) | 1 line
  
  added option to loadDataFrom() for loading values from nested arrays that PHP generated from URL-strings
........

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:52:14 +00:00
Ingo Schommer
e2c4a2d730 moved LeftAndMain test from sapphire to cms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52183 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:38:27 +00:00
Ingo Schommer
b3f8bdc8ef Merged revisions 47413 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47413 | ischommer | 2007-12-20 18:16:26 +1300 (Thu, 20 Dec 2007) | 1 line
  
  syntax
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52182 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:36:07 +00:00
Ingo Schommer
220b78454c API CHANGE added Form->getForm() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52181 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:33:55 +00:00
Ingo Schommer
770f55e9a5 Merged revisions 47401 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47401 | ischommer | 2007-12-20 16:21:21 +1300 (Thu, 20 Dec 2007) | 1 line
  
  using formfield title (instead of id) for required validation message (on serverside)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52180 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:33:15 +00:00
Ingo Schommer
a9020f477e Merged revisions 47265 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47265 | ischommer | 2007-12-18 16:57:25 +1300 (Tue, 18 Dec 2007) | 1 line
  
  initial commit
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52179 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:32:17 +00:00
Ingo Schommer
74cef69ae1 BUGFIX fixed php notice 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52178 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 03:31:11 +00:00
Ingo Schommer
74411aa4f2 update from translate.silverstripe.com 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52177 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 02:30:55 +00:00
Ingo Schommer
5cd2018d24 update from translate.silverstripe.com 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52176 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 02:24:43 +00:00
Ingo Schommer
755d6bb484 ENHANCEMENT Added test suite (currently just testing menu generation) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52175 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-06 01:57:49 +00:00
Ingo Schommer
d713777d73 API CHANGE LeftAndMain.php: Removed $extra_menu_items, $replaced_menu_items, $removed_menu_items (all handled in $menu_items now) 
API CHANGE Deprecated menu manipulation through Object::addStaticVars(), changed internal representation of menu_item array to always use associative arrays
ENHANCEMENT Added LeftAndMain::add_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::remove_menu_item()
ENHANCEMENT Moved default menu items from LeftAndMain->MainMenu() to cms/_config.php
ENHANCEMENT Added ReportAdmin::has_reports()
ENHANCEMENT Object::addStaticVars() can replace the whole array optionally
ENHANCEMENT Object::stat() optionally returns uncached results
ENHANCEMENT Moved Object::useCustomClass('SSDateTime') from Object.php to sapphire/_config.php
ENHANCEMENT Misc documentation and formatting in LeftAndMain and Object classes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52171 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-05 03:43:58 +00:00
Ingo Schommer
a42b76bc73 API CHANGE Moved "statistics" functionality into separate module, which is not distributed with a default silverstripe installation. see r52168 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-05 01:40:36 +00:00
Ingo Schommer
bcbadd3670 BUGFIX removed notices 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-05 01:39:13 +00:00
Ingo Schommer
3a492151f8 BUGFIX secured controller 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52159 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:21:59 +00:00
Ingo Schommer
0bf0c3c77f API CHANGE removed importer_Controller as its accessible through an unsecure url which writes page records and exposes debug information about them. the class naming is too broad for its purpose, and the usefulness of this class is quite limited - it doesn't appear to be used anywhere. 
API CHANGE removed "tools" directory - please use "vendor", "api" or "integration"


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52158 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:19:02 +00:00
Ingo Schommer
c9aceb01e1 Merged revisions 47264 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47264 | ischommer | 2007-12-18 16:57:08 +1300 (Tue, 18 Dec 2007) | 1 line
  
  setting $title for first sub-field instead of dismissing it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52157 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:15:42 +00:00
Ingo Schommer
0f69fdf7a4 Merged revisions 47263 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47263 | ischommer | 2007-12-18 16:56:54 +1300 (Tue, 18 Dec 2007) | 1 line
  
  added $template_main to control template rendering without subclassing
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52156 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:04:16 +00:00
Ingo Schommer
0cd12814a5 Blocked revisions 47205,47207 via svnmerge 
................
  r47205 | ischommer | 2007-12-18 10:54:43 +1300 (Tue, 18 Dec 2007) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-44682" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
................
  r47207 | ischommer | 2007-12-18 10:55:27 +1300 (Tue, 18 Dec 2007) | 16 lines
  
  Merged revisions 47204 via svnmerge from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
  
  ................
    r47204 | ischommer | 2007-12-18 10:49:49 +1300 (Tue, 18 Dec 2007) | 9 lines
    
    Merged revisions 37547 via svnmerge from 
    svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0.1-uplay
    
    ........
      r37547 | ischommer | 2007-06-29 12:36:56 +1200 (Fri, 29 Jun 2007) | 1 line
      
      added blocking
    ........
  ................
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:02:19 +00:00
Ingo Schommer
647d295fe3 Merged revisions 46622 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r46622 | ischommer | 2007-12-12 10:54:32 +1300 (Wed, 12 Dec 2007) | 1 line
  
  added Double dbfield for extended precision (e.g. when saving map-coordinates)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 23:00:37 +00:00
Ingo Schommer
ddd3ef3c34 Merged revisions 46596 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r46596 | ischommer | 2007-12-11 15:28:11 +1300 (Tue, 11 Dec 2007) | 1 line
  
  reverted precision extension (non-standard SQL for MySQL)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52153 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:58:58 +00:00
Ingo Schommer
96a245cb1c Merged revisions 46566 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r46566 | ischommer | 2007-12-11 10:16:22 +1300 (Tue, 11 Dec 2007) | 1 line
  
  Allowing precision in Float, e.g. "Float(10,5)"
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52152 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:55:38 +00:00
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
Ingo Schommer
fd4bd49c4f Blocked revisions 45976 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
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52148 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:43:59 +00:00
Ingo Schommer
35f681a648 Blocked revisions 45969 via svnmerge 
........
  r45969 | ischommer | 2007-11-29 17:07:48 +1300 (Thu, 29 Nov 2007) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/tags/rc/2.2.0-rc1
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52147 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:43:26 +00:00
Ingo Schommer
d7c3e8c6af Blocked revisions 45760 via svnmerge 
........
  r45760 | ischommer | 2007-11-27 18:01:43 +1300 (Tue, 27 Nov 2007) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-45690" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52146 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:42:46 +00:00
Ingo Schommer
62583bc620 Blocked revisions 45691 via svnmerge 
........
  r45691 | ischommer | 2007-11-27 12:05:59 +1300 (Tue, 27 Nov 2007) | 5 lines
  
  created project-branch
  --tiThis line, and those below, will be ignored--
  
  A    svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52145 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-04 22:42:08 +00:00