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
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
Sam Minnee
4a65391d09
parent-merge 36589 - Added check for default country for GeoIP.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:55:44 +00:00
Sam Minnee
2881bf34a4
parent-merge 36587 - Added check for default country for GeoIP.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:55:00 +00:00
Sam Minnee
a364c30540
parent-merge 36583 - Added check for default country for GeoIP.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:54:15 +00:00
Andrew O'Neil
c7415ad3d4
#1754 - Database upgrades problematic (merged from branches/2.2.0, r44770)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:29:10 +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
Sam Minnee
15eff6e217
#1662 - Secured draft/archived content
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 03:42:04 +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
Matt Peel
adc8757859
Changed Security::permissionFailure to be what it should be - $controller instead of $page. However, it doesn't seem to be used anywhere anyway...
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 02:33:09 +00:00
Ingo Schommer
66ecc4e75e
ENHANCEMENT added Authenticator::$default_authenticator to enable modifying the tab-order
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 21:18:27 +00:00
Sean Harvey
6a9e104006
Removed OpenID from core - it is now a module
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44372 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 06:06:00 +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
Ingo Schommer
bf90bd15b0
ENHANCEMENT: call Page_Controller->init() when rendering /Security/changepassword etc to respect any Requirements called in there
...
(thanks rhalff!)
see http://open.silverstripe.com/ticket/1595
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44361 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:23:00 +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
Andrew O'Neil
1509d413e5
#1457 - Redirection after login doesn't behave correctly if login fails (merged from 2.1.1 branch, r43601)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-04 21:30:57 +00:00
Jeremy Shipman
4c76be62c9
Reverting typography changes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:01:40 +00:00
Jeremy Shipman
943c892548
added cms_typography.css to replace typography.css in the cms, as it confusues with front end typography.css
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 02:14:20 +00:00
Andrew O'Neil
eefc4ffc06
#1562 - Group codes don't appear to be generated upon creation of group
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-30 03:17:18 +00:00
Andrew O'Neil
808d6875cb
#941 - Security flaw: SS prone to CSRF attack
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-28 21:44:38 +00:00
Matt Peel
7d0ddb9d33
Trac #1533 : Fixed Geoip::ip2country() to use user_error() instead of trigger_error() (standard practice, even though user_error()
...
is just an alias of trigger_error()) and made it raise an appropriate error (E_USER_NOTICE)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-26 02:09:34 +00:00
Ingo Schommer
cbbd5e118c
BUGFIX failing db/build due to wrong __construct()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 03:00:33 +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
Andrew O'Neil
06c2bd9b10
#1462 - OpenID $currentController problem
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 02:38:35 +00:00
Andrew O'Neil
423decf09b
#104 - createNewPassword() wordlist in static
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:51:53 +00:00
Andrew O'Neil
34590580e9
#135 - OpenID login: SQL Error "Specified key was too long"
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-24 21:15:36 +00:00
Ingo Schommer
88da4cf399
BUGFIX has_default_admin was using $default_admin instead of $default_username
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43762 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-24 01:15:53 +00:00
Hayden Smith
94c923459d
Added a security fix for Security::check_default_admin()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-23 01:18:39 +00:00
Ingo Schommer
ba85ce7a0b
FEATURE Respects 'lang' stored in cookies
...
ENHANCEMENT choose_site_lang() accepts $availableLang (useful to check if a certain page has a translation, and fall back to default language)
ENHANCEMENT Added documentation
BUGFIX Rewrote Member->Lang to Member->Locale (CMS-translations are stored in locales as well), limited Locale Varchar to 6 characters, changed profile dropdown accordingly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-21 19:53:57 +00:00
Ingo Schommer
24be30314a
removed forum-specific logic from "my profile"
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 23:41:21 +00:00
Andrew O'Neil
c7231c6935
mlanthaler: Fixed typo and updated docBlock (merged from gsoc branch, r42439)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 22:18:45 +00:00
Andrew O'Neil
588b091770
mlanthaler: default styling for open id login (merged from gsoc branch, r42438)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 22:11:59 +00:00
Andrew O'Neil
cfaa390102
mlanthaler: Fixed some docBlocks and "reformatted" code (merged from gsoc branch, r42437)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 21:57:12 +00:00
Andrew O'Neil
7df57c3040
DataObject merging error solving (merged from 2.1.0 branch, r42561 & 42588)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:55:55 +00:00
Andrew O'Neil
e46e5e73c9
Allow logging in via BasicAuth, so the publish site script can login before doing a db/build (merged from 2.1.0 branch, r41535)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:32:11 +00:00
Andrew O'Neil
508830ec38
Use permission code (merged from 2.1.0 branch, r41533)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42908 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:30:20 +00:00
Andrew O'Neil
03807c5883
Fix notices
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42907 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:24:46 +00:00