Commit Graph

85 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
Sam Minnee
eb9e66808c API CHANGE: Renamed static Member::autologinhash() to static Member::member_from_autloginhash() to be more in line with naming convnetions, and not conflict with Member.AutoLoginHash in the database
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:18:18 +00:00
Ingo Schommer
1077cbf08f MINOR Removed debug code from Member.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:05:48 +00:00
Ingo Schommer
382f34c69b (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:10:59 +00:00
Ingo Schommer
2d8434a43f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:57:59 +00:00
Ingo Schommer
03fcc80e19 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:19:54 +00:00
Ingo Schommer
0365bc113f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Sam Minnee
ac6a3023c0 Fixed testing of member-generated emails
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-20 22:36:58 +00:00
Sam Minnee
0b0e4c32d9 MINOR: #2633 - Member::map() uses object::create instead of new
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:52:08 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sean Harvey
b96608e0a3 API CHANGE Email_Template class deprecated, Email should be used from now on.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-12 09:29:05 +00:00
Sam Minnee
4cb354b79a Fixed minor bug in password validation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-15 07:14:31 +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
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
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
Sam Minnee
eb60b67732 Merged revisions 52121 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52121 | sminnee | 2008-04-03 22:04:33 +1300 (Thu, 03 Apr 2008) | 4 lines
  
  Added DataObject::validate() for specifying DataObject-level validators.
  Added DataObject::onAfterWrite(), a complement of DataObject::onBeforeWrite()
  Added password strength testing to security system
  Added password expiry to security system
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:52 +00:00
Sean Harvey
3f50c7a477 BUGFIX: Ticket #2455 - Check variable exists before accessing Password index
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 23:57:04 +00:00
Ingo Schommer
37ba118974 BUGFIX removed duplicate definition
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-10 01:43:22 +00:00
Ingo Schommer
7d917574f8 Merged revisions 50264 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r50264 | ischommer | 2008-02-27 15:18:28 +1300 (Wed, 27 Feb 2008) | 1 line
  
  added has_one static so we can define extraDBFields properly
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:27:29 +00:00
Sam Minnee
d7196a438c Merged revisions 50200 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50200 | sminnee | 2008-02-26 14:42:29 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Fixed password emailing for edited members
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:29 +00:00
Ingo Schommer
5a313be83e Merged revisions 50805 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r50805 | ischommer | 2008-03-11 10:23:53 +1300 (Tue, 11 Mar 2008) | 2 lines
  
  added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
  fixed weird indentation formatting in Member.php
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:28:35 +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
f1ba46ce42 Merged revisions 46525 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r46525 | sminnee | 2007-12-10 15:10:56 +1300 (Mon, 10 Dec 2007) | 3 lines
  
  Added Member->SetPassword, a field that lets you have a write-only password field
  Used Member->SetPassword to create a password column on the MemberTableField for SecurityAdmin
  Send 'changed password' emails when a user is first created as well as edited
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:38:48 +00:00
Sam Minnee
4ba805020a Merged revisions 43384 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43384 | hsmith | 2007-10-15 09:20:44 +1300 (Mon, 15 Oct 2007) | 1 line
  
  Added additional checks so that the email doesn't get sent to new members, or on the test site.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:31:57 +00:00
Sam Minnee
0cce4a1d4a Merged revisions 43342 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43342 | hsmith | 2007-10-12 13:57:25 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Used Object::create() to create email instances sent by the system.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:31:24 +00:00
Sam Minnee
a70743070d Merged revisions 43340 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43340 | hsmith | 2007-10-12 13:35:23 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Added BaseHref() to Member_ChangePasswordEmail so that the email shows the domain name of the current subsite. 
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:29:55 +00:00
Sam Minnee
1b53a622b4 Merged revisions 43336 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43336 | hsmith | 2007-10-12 10:31:23 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Added Member::$notify_password_change
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:27:07 +00:00
Sam Minnee
7924a93f92 Merged revisions 43334 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r43334 | hsmith | 2007-10-12 10:21:17 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Saving the member with a changed password now sends an email to the member.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:25:22 +00:00
Sam Minnee
d2b25999c8 Re-enabled session_regenerate_id()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:50:02 +00:00
Sam Minnee
f7b484658f Refactored session_regenerate_id to make it easier to disable in some circumstances.
Temporarily disabled session_regenerate_id so that Windmill can work.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 03:00:53 +00:00
Sam Minnee
41a11b277e Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Ingo Schommer
1589785b18 more solid ID-detection in php()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:42:04 +00:00
Andrew O'Neil
8b85ef1ae1 Merged revisions 46468 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46468 | sminnee | 2007-12-07 11:30:35 +1300 (Fri, 07 Dec 2007) | 1 line
  
  Added empty  array to member so that roles can add their own has_one relations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:18 +00:00
Andrew O'Neil
7b0de78a31 Merged revisions 46467 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46467 | sminnee | 2007-12-07 11:28:44 +1300 (Fri, 07 Dec 2007) | 1 line
  
  Added empty  array to member so that roles can add their own has_one relations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:11 +00:00
Andrew O'Neil
84ae974db4 #1850 - Changing default admin password after installation does not work (merged from branches/2.2.0@45907, r45451)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:30:12 +00:00
Andrew O'Neil
bd9c74e7a6 Added skeletal registration module for merge project (merged from branches/2.2.0@45907, r45385)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:41 +00:00
Normann Lou
251455bd8c delete the duplicated function and rename the one remaining to adapt coding convention
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:54:17 +00:00
Ingo Schommer
ed31f62913 removed double commit caused by merging branches/2.0-inform
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:29:42 +00:00
Andrew O'Neil
df30647a88 inform-merge r33051: WIP3610: Fact finder finishes
WIP3613: Newsletter integration 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 05:15:22 +00:00
Normann Lou
26b8f7dffe switch externals to trunk.
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sam Minnee
0d5b5b36de Fixed ->Groups()->setByCheckboxSetField for situation when nothing is checked (parents upgrade issue)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 04:49:43 +00:00
Andrew O'Neil
b636bf165a #1705 - OpenID login details appearing in wrong place
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 02:58:27 +00:00
Romain Louis
68e8e731d6 canEdit function changed to use Permission class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44538 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 01:21:26 +00:00
Romain Louis
06d53ffe00 canEdit function adding for the language saving works
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 01:10:45 +00:00
Normann Lou
e982a93ff3 Wrong parameters pass in _t(), the Namespace is missing.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:42:28 +00:00
Andrew O'Neil
9a118c3693 Removed Member::add_role()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44254 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 03:04:58 +00:00