Commit Graph

164 Commits

Author SHA1 Message Date
Ingo Schommer
b38c0d0941 Merged revisions 51659 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51659 | ischommer | 2008-03-26 15:43:01 +1300 (Wed, 26 Mar 2008) | 1 line
  
  ENHANCEMENT Moved Group field generation from SecurityAdmin->getEditForm() to Group->getCMSFields()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:34:10 +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
Ingo Schommer
ca199a64e4 Merged revisions 49507 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49507 | ischommer | 2008-02-13 15:41:11 +1300 (Wed, 13 Feb 2008) | 1 line
  
  using stat() to get template (works with subclasses)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:26:31 +00:00
Ingo Schommer
7ae4a30885 Merged revisions 48361-48363 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48361 | ischommer | 2008-01-21 21:05:53 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........
  r48362 | ischommer | 2008-01-21 21:07:13 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........
  r48363 | ischommer | 2008-01-21 21:07:43 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:17:39 +00:00
Ingo Schommer
051e1bc68b Merged revisions 48360 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48360 | ischommer | 2008-01-21 21:04:56 +1300 (Mon, 21 Jan 2008) | 1 line
  
  escaping $code, documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:16:32 +00:00
Ingo Schommer
ddda1dcbb8 Merged revisions 47679 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47679 | ischommer | 2008-01-07 16:38:49 +1300 (Mon, 07 Jan 2008) | 1 line
  
  added unregister_authenticator() and on_unregister()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:14:30 +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
Sam Minnee
11074f013f Merged revisions 50487 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50487 | sminnee | 2008-03-03 21:57:26 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2287 - Removed notice-level error when geoip's not installed
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:30 +00:00
Sam Minnee
87b936af25 Merged revisions 50290 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50290 | sminnee | 2008-02-27 17:36:18 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Added support for password and old_password encryption mechanisms if you're using MySQL
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:49 +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
974238b296 Fixed bug with BasicAuth enabled on an old database, it was preventing you from visiting db/build
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 03:59:16 +00:00
Sam Minnee
21c8752e2c Removed warning in group admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:40:13 +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
03e67fe100 Merged revisions 45748 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r45748 | sminnee | 2007-11-27 17:45:11 +1300 (Tue, 27 Nov 2007) | 1 line
  
  Create Group::canEdit(), which can be used to filter the SecurityAdmin group list
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:37:17 +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
b07725cdae Fixed illegal reference to this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48681 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-28 05:03:35 +00:00
Sean Harvey
20da7e8f95 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48306 467b73ca-7a2a-4603-9d3b-597d59a354a9 2008-01-20 03:01:18 +00:00
Sam Minnee
27849e2418 #1736 - Make Security::get_encryption_algorithms() a dynamic function again.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-18 01:55:51 +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
Ingo Schommer
794dc27b31 formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 21:51:44 +00:00
Andrew O'Neil
c09a5440ca FIx php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47975 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-14 21:19:28 +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
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
Sean Harvey
54de788984 Reversed isset() change which was causing some side effects
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47595 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-04 03:00:33 +00:00
Sean Harvey
241969d97c Fixed PHP notice undefined index - $messageSet['alreadyLoggedIn']
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-04 02:42:28 +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
Ingo Schommer
b5aaa9b1e2 additional checks before foreach() loop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 00:49:28 +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
Normann Lou
f141fbe5ad To include OldPassword field only when the curruentUser exists and (no autologinhash given or the autologinhash is not right), since there a lots of cases that the currentUser exists (like a temperary member ) but he hasn't got password yet.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46304 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 03:53:46 +00:00
Andrew O'Neil
9c6a30d363 Removed hashing algorithms that contained a command to allow for mysqldumps to be run without very weird corruption errors (merged from branches/2.2.0@45907, r45906)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:51 +00:00
Andrew O'Neil
425714a281 Authentication for test wasn't working. (merged from branches/2.2.0@45907, r45823)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:30 +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
Andrew O'Neil
f02ba8d1cb Don't show menu on LoginForm (merged from branches/2.2.0@45907, r44960)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:19:54 +00:00
Sam Minnee
6bdd810817 Updated BasicAuth to use new authenticator system.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 20:36:25 +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