]> git.openstreetmap.org Git - rails.git/history - app/views/user/_contact.html.erb
Resolve conflict
[rails.git] / app / views / user / _contact.html.erb
2013-11-28 Tom HughesMerge branch 'redesign'
2013-11-19 John FirebaughMerge branch 'master' into redesign
2013-11-16 John FirebaughMerge branch 'master' into redesign
2013-11-12 John FirebaughRationalize browse translation keys
2013-02-02 Tom HughesMerge branch 'master' into notes
2013-01-16 Tom HughesMake user markers display correctly
2013-01-15 Tom HughesMerge branch 'master' into notes
2013-01-14 Saman Bemel-BenrudSite cleanup
2012-12-01 Tom HughesMerge branch 'master' into notes
2012-11-23 Tom HughesMerge branch 'leaflet'
2012-11-09 John FirebaughPort to Leaflet
2012-10-13 Tom HughesMerge branch 'master' into notes
2012-10-05 John FirebaughMove user JS to page-specific script file
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-08-15 Tom HughesAdd a missing </tr> tag
2012-08-15 Tom HughesFixup make_friend and remove_friend properly
2012-08-14 Tom HughesRequire POST for make_friend and remove_friend
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesReplace request.request_uri with request.fullpath
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-03-25 Tom HughesHandle changesets with an empty string as the comment
2011-02-10 Tom HughesMerge branch 'master' into openid
2010-12-17 Andy AllanShow the latest changeset for each of the contacts...
2010-04-19 Tom HughesMerge branch 'master' into openid
2010-03-18 Kai KruegerMerge -r 20198:20540 from trunc into openstreetbugs...
2010-03-02 Tom HughesDon't try and show distances to friends if the user...
2010-02-28 Tom HughesAdd user images to diary view.
2010-02-28 Tom HughesAdd a border to user images.
2010-02-27 Tom HughesRework the user details screen to be less crap... Highl...