]> git.openstreetmap.org Git - rails.git/history - app/controllers/user_controller.rb
Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...
[rails.git] / app / controllers / user_controller.rb
2018-04-29 J GuthrieMerge branch 'convert_roundabout_exits' of https:/...
2018-04-29 Jamie GuthrieMerge branch 'master' into convert_roundabout_exits
2018-04-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1809'
2018-04-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1824'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1815'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1820'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1816'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1814'
2018-04-11 Andy AllanRefactor @this_user to @user
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
2017-11-25 Tom HughesExtend form-action policies for Chrome
2017-11-23 Tom HughesAllow third party images in user content
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-24 Tom HughesMerge remote-tracking branch 'upstream/pull/1658'
2017-10-22 Andy AllanAvoid using or comparing explicit model ids
2017-10-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1580'
2017-10-05 Tom HughesFix rubocop warnings
2017-08-02 Andy AllanMerge pull request #1588 from Georeactor/master
2017-08-02 Tom HughesMerge remote-tracking branch 'upstream/pull/1603'
2017-07-28 Andy AllanMerge pull request #1597 from tomhughes/current-user
2017-07-27 Tom HughesChange user forms to use current user instead of @user
2017-07-27 Tom HughesMerge remote-tracking branch 'upstream/pull/1595'
2017-07-27 Andy AllanConvert remaining controller code to use current_user
2017-07-18 Tom HughesMark account suspended flash message as HTML safe
2017-06-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1561'
2017-06-27 Tom HughesFix some tests for changes in rails 5
2017-06-05 Tom HughesReplace deprecated ActiveModel::Errors get/set methods
2017-06-05 Tom HughesReplace deprecated env method with request.env
2017-06-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-02 Tom HughesSanitise parameters used in URL generation
2017-06-02 Tom HughesRemove all use of the :text option to render
2017-06-02 Tom HughesRemove conditions from delete_all
2017-06-01 Tom HughesFix rubocop warnings
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
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/1322'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
2016-10-12 Andy AllanRemove unnecessary controller references from the redir...
2016-08-19 Tom HughesImprove code readability
2016-08-19 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1036'
2016-08-19 Simon PooleFix rubocop warnings
2016-08-19 Simon PooleMerge message when Gravatar status has changed with...
2016-08-16 Simon PooleAdd tests for change of gravatar use depending on email
2016-08-16 Simon PooleRemove default enabling of gravatar, check on initial...
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 HughesMake support email address configurable
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-26 Tom HughesTreeat user as logged in after a password reset
2016-02-26 Tom HughesPreserve username and "remember me" when login fails
2016-02-05 Tom HughesFix new rubocop warnings
2016-01-19 Tom HughesFix rubocop warnings
2015-12-12 Tom HughesPreserve URL fragments through external authentication
2015-12-07 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1099'
2015-12-07 Ilya ZverevFacebook emails are verified
2015-12-07 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1082'
2015-12-07 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1085'
2015-11-30 Tom HughesFix display of raw HTML in flash message
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1040'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1045'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1043'
2015-08-27 Tom HughesMark some flash messages as html safe
2015-08-18 Tom HughesFix new rubocopy warnings
2015-07-20 Tom HughesRequire a valid session token to resend a confirmation
2015-07-20 Tom HughesTemporary fix to avoid showing emails
2015-04-16 Tom HughesRedirect to the login page if auth failure has no origin
2015-04-16 Tom HughesPrefer username/password to openid_url if both are set
2015-04-14 Tom HughesAdd support for Google OAuth2 authentication
2015-04-14 Tom HughesFix style issues found by new rubocop version
2015-03-08 Tom HughesEver more tests...
2015-03-02 Tom HughesYet more tests...
2015-02-26 Tom HughesFix some rubocop rails style issues
2015-02-25 Tom HughesConvert OpenID authentication to generic third party...
2015-02-25 Tom HughesConvert OpenID authentication to use OmniAuth
2015-02-20 Tom HughesFix some more rubocop style issues
2015-02-20 Tom HughesStandardise on double quoted strings
2015-02-20 Tom HughesFix rubocop style issues
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2015-02-01 Richard FairhurstMerge pull request #33 from tomhughes/routing
2015-02-01 Tom HughesMerge branch 'master' into routing
2015-02-01 Thijs AlkemadeFix two issues with the remember_me_openid button
2015-01-26 Richard FairhurstMerge pull request #28 from zerebubuth/routing-ui-tweaks-2
2015-01-26 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2015-01-17 Tom HughesMerge branch 'rails42'
2015-01-11 Tom HughesReplace deprecated reset method with restore method
2015-01-11 Tom HughesReplace deprecated deliver method with deliver_now
2014-03-08 Richard FairhurstMerge pull request #14 from tomhughes/routing
next