Commit Graph

1693 Commits

Author SHA1 Message Date
Sam Minnee
d8b65304d4 Merged revisions 53188 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53188 | aoneil | 2008-04-22 14:17:32 +1200 (Tue, 22 Apr 2008) | 2 lines
  
  MINOR: Fixed some php notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:38 +00:00
Sam Minnee
1b78044780 Merged revisions 53175 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53175 | sharvey | 2008-04-22 12:51:14 +1200 (Tue, 22 Apr 2008) | 1 line
  
  BUGFIX: Removed display: none for "nolabel" class - this is custom project code, and shouldn't be in sapphire!
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53527 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:27 +00:00
Sam Minnee
9e135033d6 Merged revisions 53160 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53160 | sharvey | 2008-04-22 11:54:36 +1200 (Tue, 22 Apr 2008) | 1 line
  
  BUGFIX: Ticket #2455 - Check variable exists before accessing Password index
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:16 +00:00
Sam Minnee
76e6ea3dc9 Merged revisions 53106 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53106 | rlouis | 2008-04-21 15:47:15 +1200 (Mon, 21 Apr 2008) | 1 line
  
  _t call for EXPORTCSV problem fixed
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53525 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:54:00 +00:00
Sam Minnee
96719bdf09 Merged revisions 53105 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53105 | rlouis | 2008-04-21 15:46:37 +1200 (Mon, 21 Apr 2008) | 1 line
  
  DataReport EXPORTCSV field missing
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:48 +00:00
Sam Minnee
5442265707 Blocked revisions 53102 via svnmerge
................
  r53102 | ischommer | 2008-04-21 15:35:34 +1200 (Mon, 21 Apr 2008) | 9 lines
  
  Merged revisions 53101 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r53101 | ischommer | 2008-04-21 15:33:24 +1200 (Mon, 21 Apr 2008) | 1 line
    
    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@53523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:32 +00:00
Sam Minnee
f427047b9d Merged revisions 53075 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53075 | sminnee | 2008-04-21 10:56:46 +1200 (Mon, 21 Apr 2008) | 1 line
  
  Made has_one, has_many, and many_many methods more reliable
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:23 +00:00
Sam Minnee
1bc00f4b2d Merged revisions 53066 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53066 | sminnee | 2008-04-21 10:14:48 +1200 (Mon, 21 Apr 2008) | 2 lines
  
  Make double-redirects a warning rather than an error, since they are usually benign.
  Don't redirect from /home to / if you've already called a redirection.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:13 +00:00
Sam Minnee
8a5b360abd Merged revisions 52719 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52719 | sminnee | 2008-04-15 11:56:10 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed ContentController where ->dataRecord is empty
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:59 +00:00
Sam Minnee
45804905ed Merged revisions 52452 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52452 | sminnee | 2008-04-10 13:59:09 +1200 (Thu, 10 Apr 2008) | 1 line
  
  Don't strtolower ->action, as it had too many side-effects.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:49 +00:00
Sam Minnee
8b508319ab Merged revisions 52448 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52448 | sminnee | 2008-04-10 13:50:28 +1200 (Thu, 10 Apr 2008) | 1 line
  
  #2387 - Fields specified in DataObjectDecor not saved in some cases
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:36 +00:00
Sam Minnee
739bda485f Merged revisions 52401 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52401 | sminnee | 2008-04-09 22:06:35 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Fixed Authenticators to work with r52400
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:51:52 +00:00
Sam Minnee
df3a3e5514 Merged revisions 52400 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52400 | sminnee | 2008-04-09 20:27:13 +1200 (Wed, 09 Apr 2008) | 1 line
  
  #2299 - Fatal error in specific version of PHP
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53516 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:51:42 +00:00
Sam Minnee
a9cba1106c Merged revisions 52399 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line
  
  BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:51:30 +00:00
Sam Minnee
b9b4a1e2b2 Merged revisions 52398 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52398 | sminnee | 2008-04-09 18:19:30 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:51:18 +00:00
Sam Minnee
bd19050f5c Merged revisions 52394 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52394 | ischommer | 2008-04-09 18:07:40 +1200 (Wed, 09 Apr 2008) | 1 line
  
  BUGFIX disable third party browscap by default (#2336)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:49:26 +00:00
Sam Minnee
eae79ab0de Merged revisions 52391 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52391 | sminnee | 2008-04-09 17:58:21 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Show security id errors on test sites as well as dev
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53512 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:49:14 +00:00
Sam Minnee
d9998f2684 Merged revisions 52350 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52350 | sminnee | 2008-04-09 12:35:52 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Improved behaviour of contentcontrollerInit when extensions are applied to subclasses of SiteTree
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:49:01 +00:00
Sam Minnee
a6af17943c Merged revisions 52295 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52295 | aoneil | 2008-04-08 12:25:24 +1200 (Tue, 08 Apr 2008) | 2 lines
  
  fix links in RSS feeds
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53510 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:47:56 +00:00
Sam Minnee
091c0afc2e Merged revisions 52293 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52293 | aoneil | 2008-04-08 12:03:43 +1200 (Tue, 08 Apr 2008) | 2 lines
  
  don't cache in overridden instance_get(), as the fields are different for subclasses
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:47:29 +00:00
Sam Minnee
88d79d1b62 Merged revisions 52224 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52224 | sminnee | 2008-04-07 11:45:23 +1200 (Mon, 07 Apr 2008) | 1 line
  
  #2314 - Fixed SQLMap implementation so that Group::map() returns appropriate data, and the group dropdown on the access tab works.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:44:06 +00:00
Sam Minnee
2069e33bea Merged revisions 52213 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52213 | sminnee | 2008-04-07 10:16:43 +1200 (Mon, 07 Apr 2008) | 1 line
  
  #2362 - Fixed change password form
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:43:20 +00:00
Sam Minnee
b836bc7825 Merged revisions 52933 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52933 | sminnee | 2008-04-17 18:37:21 +1200 (Thu, 17 Apr 2008) | 1 line
  
  ImageUploader fields are accessible by CMS_ACCESS_CMSMain, rather than ADMIN
........


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

........
  r52878 | sminnee | 2008-04-16 20:13:41 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Show bad error messages in a red style
........


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

........
  r52877 | sminnee | 2008-04-16 20:13:25 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Validate SetPassword as well as Password by the member validator
........


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

........
  r52876 | sminnee | 2008-04-16 20:13:04 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Removed validation from ConfirmedPasswordField - use Member validation instead
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:50 +00:00
Sam Minnee
050c19659c Merged revisions 52798 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52798 | sminnee | 2008-04-15 22:26:08 +1200 (Tue, 15 Apr 2008) | 1 line
  
  People who are given access to SecurityAdmin should only be able to edit admin groups if they have an ADMIN permission
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:39 +00:00
Sam Minnee
0f58f9d232 Merged revisions 52795 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52795 | sminnee | 2008-04-15 22:19:09 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Allow FormResponse loading into CTF pop-up
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:27 +00:00
Sam Minnee
b6189c1612 Merged revisions 52794 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52794 | sminnee | 2008-04-15 22:18:17 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Disabled changePassword email - use the onBeforeWrite email instead
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:14 +00:00
Sam Minnee
7409776a26 Merged revisions 52647 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52647 | sminnee | 2008-04-13 21:48:51 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Added Group.IPRestrictions field, for limiting security group access by IP range
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53486 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:35:03 +00:00
Sam Minnee
90b2401276 Blocked revisions 52646 via svnmerge
........
  r52646 | sminnee | 2008-04-13 17:56:32 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Fixed bug when creating members without passwords
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:49 +00:00
Sam Minnee
9c7a862a56 Blocked revisions 52644 via svnmerge
................
  r52644 | sminnee | 2008-04-13 17:06:03 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52452 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52452 | sminnee | 2008-04-10 13:59:09 +1200 (Thu, 10 Apr 2008) | 1 line
    
    Don't strtolower ->action, as it had too many side-effects.
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:42 +00:00
Sam Minnee
8b8d8e0559 Blocked revisions 52643 via svnmerge
................
  r52643 | sminnee | 2008-04-13 17:05:53 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52448 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52448 | sminnee | 2008-04-10 13:50:28 +1200 (Thu, 10 Apr 2008) | 1 line
    
    #2387 - Fields specified in DataObjectDecor not saved in some cases
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:35 +00:00
Sam Minnee
9f587416f6 Blocked revisions 52642 via svnmerge
................
  r52642 | sminnee | 2008-04-13 17:05:45 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52401 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52401 | sminnee | 2008-04-09 22:06:35 +1200 (Wed, 09 Apr 2008) | 1 line
    
    Fixed Authenticators to work with r52400
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:28 +00:00
Sam Minnee
1f570ed327 Blocked revisions 52641 via svnmerge
................
  r52641 | sminnee | 2008-04-13 17:05:37 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52400 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52400 | sminnee | 2008-04-09 20:27:13 +1200 (Wed, 09 Apr 2008) | 1 line
    
    #2299 - Fatal error in specific version of PHP
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:22 +00:00
Sam Minnee
674509806e Blocked revisions 52640 via svnmerge
................
  r52640 | sminnee | 2008-04-13 17:05:27 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52399 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line
    
    BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving)
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:16 +00:00
Sam Minnee
45bcd78790 Blocked revisions 52639 via svnmerge
................
  r52639 | sminnee | 2008-04-13 17:05:16 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52398 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52398 | sminnee | 2008-04-09 18:19:30 +1200 (Wed, 09 Apr 2008) | 1 line
    
    Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:06 +00:00
Sam Minnee
297b1c5d40 Blocked revisions 52638 via svnmerge
................
  r52638 | sminnee | 2008-04-13 17:05:05 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52394 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52394 | ischommer | 2008-04-09 18:07:40 +1200 (Wed, 09 Apr 2008) | 1 line
    
    BUGFIX disable third party browscap by default (#2336)
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:34:00 +00:00
Sam Minnee
8b20ef33eb Blocked revisions 52637 via svnmerge
................
  r52637 | sminnee | 2008-04-13 17:04:52 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52391 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52391 | sminnee | 2008-04-09 17:58:21 +1200 (Wed, 09 Apr 2008) | 1 line
    
    Show security id errors on test sites as well as dev
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:53 +00:00
Sam Minnee
439280c99a Blocked revisions 52636 via svnmerge
................
  r52636 | sminnee | 2008-04-13 17:04:39 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52350 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52350 | sminnee | 2008-04-09 12:35:52 +1200 (Wed, 09 Apr 2008) | 1 line
    
    Improved behaviour of contentcontrollerInit when extensions are applied to subclasses of SiteTree
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53476 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:46 +00:00
Sam Minnee
b99977f534 Blocked revisions 52635 via svnmerge
................
  r52635 | sminnee | 2008-04-13 17:04:29 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52295 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52295 | aoneil | 2008-04-08 12:25:24 +1200 (Tue, 08 Apr 2008) | 2 lines
    
    fix links in RSS feeds
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:38 +00:00
Sam Minnee
1d12fbf677 Blocked revisions 52634 via svnmerge
................
  r52634 | sminnee | 2008-04-13 17:04:03 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52293 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52293 | aoneil | 2008-04-08 12:03:43 +1200 (Tue, 08 Apr 2008) | 2 lines
    
    don't cache in overridden instance_get(), as the fields are different for subclasses
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:31 +00:00
Sam Minnee
e0f550622d Blocked revisions 52633 via svnmerge
................
  r52633 | sminnee | 2008-04-13 17:03:52 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52224 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52224 | sminnee | 2008-04-07 11:45:23 +1200 (Mon, 07 Apr 2008) | 1 line
    
    #2314 - Fixed SQLMap implementation so that Group::map() returns appropriate data, and the group dropdown on the access tab works.
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:21 +00:00
Sam Minnee
522f052ca0 Blocked revisions 52632 via svnmerge
................
  r52632 | sminnee | 2008-04-13 17:03:41 +1200 (Sun, 13 Apr 2008) | 9 lines
  
  Merged revisions 52213 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
  
  ........
    r52213 | sminnee | 2008-04-07 10:16:43 +1200 (Mon, 07 Apr 2008) | 1 line
    
    #2362 - Fixed change password form
  ........
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53472 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:08 +00:00
Sam Minnee
310f718096 Blocked revisions 52620 via svnmerge
........
  r52620 | sminnee | 2008-04-13 17:00:45 +1200 (Sun, 13 Apr 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-52055" from 
  http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:33:01 +00:00
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