]> git.openstreetmap.org Git - rails.git/history - app/models/user.rb
Merge pull request #4148 from tomhughes/avatar-image
[rails.git] / app / models / user.rb
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2269'
2019-06-19 Andy AllanPass the models, not the ids, when dealing with friendships
2019-06-19 Andy AllanRename user.friend_users to user.friends
2019-06-19 Andy AllanRename Friend model to Friendship
2019-06-18 Tom HughesMerge remote-tracking branch 'upstream/pull/2226'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2228'
2019-06-10 Tom HughesMerge remote-tracking branch 'upstream/pull/2204'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2225'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2237'
2019-05-29 Tom HughesMerge remote-tracking branch 'upstream/pull/2236'
2019-05-29 Andy AllanUpdate annotations to correctly show bigint types
2019-05-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2028'
2019-05-13 Simon PooleAdd links to the ToU and include them in signup
2019-03-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2175'
2019-03-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2182'
2019-03-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2177'
2019-03-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2164'
2019-03-13 Andy AllanMove all settings to settings.yml
2019-03-08 Tom HughesPrevent leading and trailing whitespace on email addresses
2019-03-08 Tom HughesStrip leading and trailing whitespace for email authent...
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2018-11-05 Tom HughesMerge remote-tracking branch 'upstream/pull/2044'
2018-11-05 Tom HughesMerge character validators
2018-11-05 Tom HughesMerge leading and trailing whitespace validators
2018-11-05 J GuthrieChanged User model to not allow nil display_name (w...
2018-11-05 J GuthrieCreate invalid_char validators and apply to models
2018-11-05 J GuthrieAdded more non-ascii chars to validation (matching...
2018-11-05 J GuthrieFix rubucop errors
2018-11-05 J GuthrieMake invalid char list more explicit (between ascii...
2018-11-05 J GuthrieAdded trailing/leading whitespace errors to locale
2018-11-05 J GuthrieSpecifiy invalid chars in username error message
2018-10-10 Andy AllanMerge branch 'authz' of https://github.com/rubyforgood...
2018-06-18 Tom HughesUpdate to rails 5.2.0
2018-06-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1576'
2018-06-10 Tom HughesMerge branch 'master' into next
2018-05-27 J GuthrieChange language immediately after updating settings
2018-04-11 Andy AllanMerge branch 'master' into moderation
2018-03-26 Tom HughesFix new rubocop warnings
2018-03-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1788'
2018-03-21 Andy AllanUse user_path links. Fixes #1785
2018-03-14 Andy AllanRemove nonsense has_one relationship
2018-03-09 Andy AllanMerge branch 'pull/1765'
2018-03-04 Tom HughesValidate user location is sensible
2018-03-04 Tom HughesUse home_tile to find nearby users
2018-03-04 Tom HughesAdd an indexed home_tile column to the user table
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-27 Tom HughesMerge remote-tracking branch 'upstream/pull/1769'
2018-02-26 Tom HughesExclude hidden diary entries and comments from spam...
2018-02-04 Tom HughesMerge remote-tracking branch 'upstream/pull/1704'
2018-02-03 Tom HughesMerge remote-tracking branch 'upstream/pull/1693'
2018-01-22 Tom HughesFix new rubocop warnings
2018-01-21 Andy AllanMerge branch 'master' into moderation
2017-11-29 Andy AllanMerge branch 'master' into moderation
2017-11-22 Andy AllanMerge branch 'pull/843' into titles
2017-11-22 Andy AllanMerge branch 'p' of https://github.com/jfirebaugh/opens...
2017-11-15 Andy AllanMerge branch 'wheres_this' of https://github.com/pnorma...
2017-10-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1652'
2017-10-24 Tom HughesMerge remote-tracking branch 'upstream/pull/1659'
2017-10-22 Andy AllanAdd annotate gem and associated rake task. Annotate...
2017-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-01 Tom HughesFix rubocop warnings
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1347...
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1401'
2017-02-05 Tom HughesUpdate rubocop
2016-12-18 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1367'
2016-11-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1350'
2016-10-31 Tom HughesFix rubocop warnings
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-20 Tom HughesFix rubocop warnings
2016-10-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1309'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
2016-10-07 Mikel Maronfix rubocop warnings
2016-10-07 Mikel Maronmore idiomatic models for diary entry subscriptions
2016-10-03 Mikel MaronWIP diary comment subscriptions
2016-08-22 Matt AmosMade rubocop happy by formatting and minor syntax tweaks.
2016-08-22 ShreyAdded sortable headers + search + reportable Notes
2016-08-22 ShreyDB changes + Related issues added
2016-08-22 ShreyAdded IssueComments + ForeignKeys + Indexes
2016-08-22 ShreyAdded authorization + issues dashboard
2016-08-16 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/788'
2016-08-15 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1004'
2016-08-14 Tom HughesReorder auth_success handlers
2016-03-20 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2016-03-14 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1120'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1122'
2016-02-05 Tom HughesFix new rubocop warnings
2016-01-19 Tom HughesFix rubocop warnings
2016-01-06 Tom HughesRework locale selection
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-08-18 Tom HughesFix new rubocopy warnings
2015-04-14 Tom HughesFix style issues found by new rubocop version
2015-03-31 Tom HughesAllow space as a language separator
2015-02-26 Tom HughesFix some rubocop rails style issues
2015-02-25 Tom HughesConvert OpenID authentication to generic third party...
next