]> git.openstreetmap.org Git - rails.git/history - app/controllers/user_preference_controller.rb
Merge remote-tracking branch 'openstreetmap/pull/1496'
[rails.git] / app / controllers / user_preference_controller.rb
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1339'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1338'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1337'
2016-10-26 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1336'
2016-10-26 Andy AllanSuppress XML parsing errors.
2016-08-15 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1004'
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
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-04-14 Tom HughesFix style issues found by new rubocop version
2015-02-26 Tom HughesFix some rubocop rails 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-20 Tom HughesCleanup trailing whitespace
2014-11-03 Richard FairhurstMerge pull request #24 from zerebubuth/routing-merge
2014-11-03 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2014-11-01 Tom HughesMerge branch 'master' into overpass
2014-07-21 Tom HughesMerge branch 'rails41'
2014-07-04 Tom HughesUpdate for API change in CPK 7.x
2013-07-19 Tom HughesMerge remote-tracking branch 'osmlab/map-ui'
2013-07-19 Tom HughesReplace `:nothing => true` with `:text => ""`
2013-05-10 Tom HughesTidy up user preferences controller
2013-05-09 Tom HughesFix a few user preferences bugs
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesDisable CSRF token verification for API methods
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-08-18 Tom HughesMerge oauth branch at r17138 to trunk.
2009-08-13 Tom HughesMerge 16891:17044 from trunk.
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-07-31 Matt AmosMerged 16488:16743 from trunk.
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-04-20 Tom HughesMerge api06 branch to trunk.
2009-04-16 Tom HughesMerge 14394:14533 from trunk.
2009-04-09 Thomas WoodUse the right keyword this time...
2009-04-09 Thomas WoodAdd exceptions for remaing cases where XML::Parser...
2009-04-08 Tom HughesMerge 14059:14394 from trunk.
2009-03-12 Tom HughesMerged 14009:14059 from trunk.
2009-03-08 Tom HughesMerge 12304:14009 from trunk.
2009-03-08 Tom HughesFix for libxml 1.0.0 changes.
2008-12-12 Shaun McDonaldresync from rails_port 11795:12304
2008-12-12 Shaun McDonaldImproving the not found handling of preferences. adding...
2008-05-09 Tom HughesMerge 7452:7744 from trunk.
2008-05-04 Tom HughesMerge 7649:7673 from trunk.
2008-05-04 Tom HughesGo back to using user_id+k as the primary key for user...
2008-05-03 Gabriel Ebnersplit_node_tags: Merge changes from main branch.
2008-05-03 Steve Coastadd individual user preference read/write, and default...
2008-02-23 Tom HughesUse named constants for HTTP response codes.
2008-02-23 Steve CoastUser prference system basically done
2008-02-23 Steve Coastpreference stuff