1
0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00

43 Commits

Author SHA1 Message Date
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:  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 - 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
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
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
423decf09b - 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
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
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
Ingo Schommer
e07939d9df styling in profile-popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 23:06:15 +00:00
Ingo Schommer
a6700028b2 BUGFIX: Changed language-dropdown to normal dropdown-field (wasn't selecting the right languages)
FEATURE: Added "profile"-popup with Member_ProfileForm (see r42730)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:16:23 +00:00
Ingo Schommer
0bf09f0df0 removed DriversLicense references from LoginForm (guess thats leftovers from perweek-client)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-21 00:07:15 +00:00
Ingo Schommer
e7bc735774 mlanthaler: The validators for the Member extensions didn't work until now, these changes fix that issue.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:55:47 +00:00
Ingo Schommer
44d5aef37a bfojcapell: Added Lang field to store user preferred language
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:21:55 +00:00
Ingo Schommer
3520afc7e8 elofgren: Add: 'Note: This does not seem to be used anywhere.' next to 'Bounced' => 'Boolean' Member 'db' definition.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:59:59 +00:00
Ingo Schommer
f4f6eb0333 elofgren: BUGFIX: In Member->setBlacklistedEmail(bool) call this->write() so that the BlacklistedEmail? field state will be saved to the Member database table.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:53:02 +00:00
Ingo Schommer
7d600b025d mlanthaler: Refactored the created code since the coding conventions for static methods were changed (ticket ).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41982 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:44:30 +00:00
Ingo Schommer
f54e9db8b9 mlanthaler: Newly implemented "I've lost my password" feature that works also with encrypted passwords (ticket ).
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
7be8460917 mlanthaler: Added support for password encryption (http://support.silverstripe.com/gsoc/ticket/34).
See http://www.silverstripe.com/google-summer-of-code-forum/flat/2417 for more information.  
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:51:37 +00:00
Ingo Schommer
1119948ec4 mlanthaler: Reverted changes from r38216 which was an invalid fix. Also adjusted the method so that now cookies are accessed exclusively over the Cookie class.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:43:04 +00:00
Ingo Schommer
180c06fd15 elofgren: BUGFIX: Make 'Remember me next time?' setting work even if the ':' in _COOKIEalc_enc? is converted to '%3a' by calling urldecode($_COOKIEalc_enc?) See: http://www.silverstripe.com/google-summer-of-code-forum/flat/1826#post1832
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:07:24 +00:00
Ingo Schommer
3b5a0862f3 mlanthaler: Changed the name of DataObject::add_extension() to DataObject::addExtension() (to have consistent method names) and added the a Member::addRole().
ischommer: Functionality moved to Object, and DataObject::addExtension is NOT consistent naming! (static methods coding conventions)
Now everything is as described in http://doc.silverstripe.com/doku.php?id=member#new_ideamember_role_decorator. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:40:28 +00:00
Ingo Schommer
fedd019322 sminnee: Changes to keep db/build working on sites that don't yet have RememberLoginToken?
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:27:40 +00:00
Ingo Schommer
9e89a46853 mlanthaler: Member class is now completely documented, although the documentation of Member::map() and Member::mapInGroups() should be improved (marked with an @todo tag).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:23:44 +00:00
Ingo Schommer
f96879bb13 elofgren: In Member::autoLogin() suppress errors in the call to list() so that I don't get this error if _COOKIEalc_enc? does not have the expected parts:
Notice: Undefined offset: 1 in /var/www/silverstripe-gsoc/sapphire/security/Member.php on line 69 
Which causes this error: 
FATAL ERROR: session_regenerate_id() [function.session-regenerate-id]: Cannot regenerate session id - headers already sent 
At line 40 in /var/www/silverstripe-gsoc/sapphire/security/Member.php 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:14:35 +00:00
Ingo Schommer
fcc1ea82a3 elofgren: Add missing single quotes around 'uid' variable in call to DataObject::get_one in Member::autoLogin()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41787 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:13:51 +00:00
Ingo Schommer
fbc375a282 mlanthaler:OpenID authentication works now. To use it simple create an user account without password and put your *complete* OpenID identifier in the email field, e.g. "http://markus-lanthaler.myopenid.com/".
You can get a free OpenID from http://www.myopenid.com  (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:10:18 +00:00
Ingo Schommer
b0e9e89aad mlanthaler: Bugfix: The added isset() caused a bug when adding a new member because it produces an invalid SQL statement ("... WHERE (ID IN ())"). (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 18:23:28 +00:00
Ingo Schommer
f3018529ac elofgren: Add 2 needed isset() calls: in forms/Form.php and security/Member.php (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:10:37 +00:00
Jeremy Shipman
e386cbae57 created alteration_message method to replace all the code used to echo changes when dbbuild runs, with appropriate colouring.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 03:31:14 +00:00
Jeremy Shipman
46c9efaecc Changed colouring of db/build to be more appropriate for the actual meaning of the messages.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-24 02:47:37 +00:00
Andrew O'Neil
65c7a3f0f4 Fixed php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39936 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-13 22:04:03 +00:00
Andrew O'Neil
4560135eb9 FIxed db/build authentification errors, merged from gsoc r39559 and r37162
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-06 00:47:31 +00:00
Andrew O'Neil
97ff1db6f9 Fixed some php notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 23:15:05 +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