Commit Graph

12 Commits

Author SHA1 Message Date
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Andrew O'Neil
b3eafc24a2 Merged revisions 56164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r56164 | sharvey | 2008-06-13 10:19:41 +1200 (Fri, 13 Jun 2008) | 1 line
  
  BUGFIX ChangePasswordEmail.ss variable spacing, and missing labels for i18n _t() calls. See tickets #2571 and #2480
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:01:17 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
a7c4af9d2e Merged revisions 43335 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43335 | hsmith | 2007-10-12 10:25:16 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Added missing ChangePasswordEmail.ss
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:26:50 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Andrew O'Neil
5f468b4902 Fixed translation error (merged from branches/2.2.0@45907, r45134)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:24:23 +00:00
Andrew O'Neil
758d6806c1 #1579 - Forgot password email doesn't show translated control properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 02:01:28 +00:00
Ingo Schommer
393caf4287 FEATURE made sapphire i18n-capable
FEATURE a little bit of german translation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 02:47:45 +00:00
Ingo Schommer
f54e9db8b9 mlanthaler: Newly implemented "I've lost my password" feature that works also with encrypted passwords (ticket #48).
There are some (cosmetically) things that should be fixed, but everything work as it should. 
Will fix those things after my vacation. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41976 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:32:48 +00:00
Ingo Schommer
6d5eb70625 elofgren: BUGFIX: Add missing 'GenericEmail?.ss' template which is used in RecipientImportField::notifyChanges() as part of fix for bug 'Errors when Importing Recipients to Newsletter Mailing List' Reported here: http://www.silverstripe.com/bugs/flat/1470
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:42:23 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00