]> git.openstreetmap.org Git - rails.git/history - app/models/user.rb
Merge branch 'pull/4985'
[rails.git] / app / models / user.rb
2011-05-22 Tom HughesMerge branch 'master' into openid
2011-05-21 Tom HughesMerge branch 'master' into openid
2011-05-21 Tom HughesMerge branch 'openID' of git://git.openstreetmap.org...
2011-04-20 Tom HughesMerge branch 'master' into openstreetbugs
2011-04-20 Kai KruegerMerge branch 'master' into openstreetbugs2
2011-02-10 Tom HughesMerge branch 'master' into openid
2010-12-17 Andy AllanShow the latest changeset for each of the contacts...
2010-12-17 Andy AllanUse configuration variables for limiting nearby users...
2010-12-05 Tom HughesMerge branch 'master' into openid
2010-11-29 Tom HughesImplement automatic OAuth setup for Potlatch 2
2010-11-29 Matt AmosInitial work on support for multiple editors
2010-10-23 Tom HughesMerge branch 'master' into openid
2010-10-17 Tom HughesMerge branch 'master' into openid
2010-10-04 Tom HughesMerge branch 'master' into openid
2010-09-24 Tom HughesMerge branch 'master' into openid
2010-09-09 Tom HughesMerge branch 'master' into openid
2010-09-09 Tom HughesMerge branch 'master' into openid
2010-09-06 Tom HughesMerge branch 'master' into openid
2010-07-28 Tom HughesMerge branch 'master' into openid
2010-07-28 Tom HughesMerge branch 'master' into openstreetbugs
2010-06-28 Tom HughesReject leading and trailing whitespace in display names
2010-06-27 Tom HughesMerge branch 'master' into openid
2010-06-16 Tom HughesMerge branch 'master' into openid
2010-06-07 Tom HughesMerge branch 'master' into openid
2010-05-17 Tom HughesMerge branch 'master' into openid
2010-05-16 Tom HughesMerge branch 'master' into openid
2010-05-16 Tom HughesMerge branch 'master' into openid
2010-05-16 Tom HughesMerge branch 'master' into openid
2010-05-14 Tom HughesMerge branch 'master' into openid
2010-05-13 Tom HughesMerge branch 'master' into openid
2010-05-11 Tom HughesMerge branch 'master' into openid
2010-05-11 Tom HughesMerge branch 'master' into openid
2010-05-09 Tom HughesMerge branch 'master' into openid
2010-05-07 Tom HughesMerge branch 'master' into openstreetbugs
2010-05-07 Tom HughesMerge branch 'master' into openid
2010-05-07 Tom HughesMerge branch 'master' into terms
2010-05-06 Tom HughesTell users their account has been suspended when they...
2010-05-06 Tom HughesAdd support for suspended and confirmed users
2010-05-06 Tom HughesInclude the user description in the spam score
2010-05-06 Tom HughesAdd a spam_score method to the user model
2010-05-02 Kai KruegerMerge branch 'master' of git://git.openstreetmap.org...
2010-05-02 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-27 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-24 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-20 Ævar Arnfjörð Bjar... Merge branch 'master' into openID
2010-04-19 Tom HughesMerge branch 'master' into openid
2010-04-19 Tom HughesMerge branch 'master' into copyright
2010-04-19 Tom HughesMerge branch 'master' into openstreetbugs
2010-04-19 Tom HughesMerge branch 'master' into terms
2010-04-19 Tom HughesIgnore whitespace around the commas when splitting...
2010-02-27 Kai Kruegermerge 19889:20181 of rails_port into the openID branch
2010-02-25 Tom HughesImprove email address validation and add validation...
2010-02-06 Kai Kruegermerge 19601:19888 of rails_port into the openID branch
2010-01-23 Kai Kruegermerge 19364:19600 of rails_port into the openID branch
2010-01-10 Kai KruegerThis is the initial implementation of login via OpenID
2009-10-13 Tom HughesMerge 17130 from trunk.
2009-10-13 Tom HughesMerged 17073:17076 from trunk.
2009-10-13 Tom HughesMerged 17047 from trunk.
2009-10-13 Tom HughesMerge 17067 from trunk.
2009-10-13 Tom HughesMerged 17256:18123 from trunk.
2009-10-06 Tom HughesMerge blocking branch to head.
2009-10-05 Tom HughesMerge 17944:17988 from trunk.
2009-10-02 Matt AmosMerging 17905:17944 from trunk.
2009-10-01 Tom HughesReplace a couple calls to inject with more readble...
2009-10-01 Tom HughesCorrect comment.
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-09-30 Matt AmosAdded better messages and error handling in a couple...
2009-09-29 Matt AmosNew migration to add better auditing to user_roles...
2009-09-29 Andy AllanMerge r17285 from the oauth branch - allow flash access...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...
2009-09-04 Tom HughesUpdate to rails 2.3.4 for security fixes.
2009-08-18 Tom HughesMerge oauth branch at r17138 to trunk.
2009-08-13 Tom HughesMerge 16891:17044 from trunk.
2009-08-13 Tom HughesAdd extra visibility options for GPS traces, and enhanc...
2009-08-06 Matt AmosMerging 16820:16891 from trunk.
2009-08-03 Tom HughesMerge 16817:16819 from trunk.
2009-08-03 Tom HughesMerge 16743:16811 from trunk.
2009-08-03 Tom HughesExclude deleted messages from the new_messages relation...
2009-07-31 Matt AmosMerged 16488:16743 from trunk.
2009-07-23 Tom HughesIgnore deleted traces when returning a user's traces...
2009-07-23 Tom HughesAllow messages to be deleted from the outbox as well...
2009-07-23 Tom HughesAdd the ability for a recipient to (logically) delete...
2009-07-14 Tom HughesMerge 16110:16487 from trunk.
2009-06-25 Tom HughesMerge 16070:16110 from trunk.
2009-06-23 Tom HughesRevert r16046.
2009-06-22 Matt AmosAdding initial version of the OAuth token authenticatio...
2009-06-05 Tom HughesMore work on optimisation the location of nearby users...
2009-06-05 Tom HughesOptimise the finding of nearby users a bit.
2009-06-01 Shaun McDonaldmore tranlations for validations. Bug fix for the missi...
2009-05-31 Tom HughesMerged I18N branch to head.
2009-05-31 Tom HughesSend notification messages in the target user's language.
2009-05-31 Tom HughesSort out storage and use of user preferred languages.
2009-05-22 Shaun McDonaldFirst stage of i18n. Some migrations and extra plugins.
2009-04-25 Tom HughesNull descriptions are not allowed.
2009-04-23 Tom HughesBackout broken attempt at making case insensitive authe...
2009-04-23 Shaun McDonaldHack a way to make the email and display name case...
2009-04-20 Tom HughesMerge api06 branch to trunk.
2009-04-16 Tom HughesMerge 14394:14533 from trunk.
2009-04-08 Tom HughesMerge 14059:14394 from trunk.
next