]> git.openstreetmap.org Git - rails.git/history - app/views/user/view.html.erb
Resolve conflict
[rails.git] / app / views / user / view.html.erb
2013-11-28 Tom HughesMerge branch 'redesign'
2013-11-19 John FirebaughMerge branch 'master' into redesign
2013-11-18 Aaron LidmanImprove changeset detail display
2013-11-16 John FirebaughMerge branch 'master' into redesign
2013-11-06 Eden Halperingroundwork for responsive menu
2013-11-06 John FirebaughLink to full-world view for user changeset list
2013-06-02 Tom HughesUse GET for make_friend when the user is not logged in
2013-04-23 Tom HughesMerge branch 'notes'
2013-04-16 Tom HughesMerge branch 'master' into notes
2013-04-08 Tom HughesMerge branch 'master' into notes
2013-03-28 Tom HughesMerge branch 'master' into notes
2013-02-05 Tom HughesMerge branch 'master' into notes
2013-02-02 Tom HughesMerge branch 'master' into notes
2013-01-24 Tom HughesFix lists in rich text to display properly
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-20 Tom HughesMerge branch 'master' into notes
2012-11-09 John FirebaughPort to Leaflet
2012-10-15 Tom HughesMerge branch 'master' into notes
2012-10-15 Tom HughesFix links to user notes
2012-10-13 Tom HughesMerge branch 'master' into notes
2012-10-07 Paweł PaprotaDisplay a diary entry count on the user page
2012-10-05 John FirebaughSimplify further by using OSM.home
2012-10-05 John FirebaughRemove unused params code
2012-10-05 John FirebaughMove user JS to page-specific script file
2012-09-20 Tom HughesMerge branch 'master' into openstreetbugs
2012-09-20 Tom HughesMove the administrator details further down the user...
2012-09-20 Tom MacWrightmoderate refactoring of the user page
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-08-15 Tom HughesFixup make_friend and remove_friend properly
2012-08-14 Tom MacWrightFix regression - no link to view diary of other users
2012-08-14 Tom HughesRequire POST for make_friend and remove_friend
2012-08-10 Tom HughesImprove blocks on/by links on user pages
2012-08-10 Tom MacWrightImprove user page navigation menu
2012-06-18 Tom HughesRemove use of deprecated :comment attribute on link_to...
2012-03-21 Tom HughesMove generation of role icons into a helper
2012-03-20 Tom HughesGet rid of custom CSRF protection for user role changes
2012-03-17 Tom HughesTreat all newly entered blocks of text as Markdown
2012-03-10 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-09 Tom HughesFix various routing and route generation errors
2012-03-08 Tom HughesMerge branch 'master' into openstreetbugs
2012-02-29 Tom HughesRemoved line break
2012-02-28 Steve SingerAdd a view to show diary comments left by a user
2012-01-07 Mikel MaronAdd some more social features
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-12-15 Mikel MaronAdd support for viewing a list of your friends' changesets
2011-12-09 Tom HughesDisplay CT status on the user page
2011-12-09 Tom HughesDon't try and show the IP address when there isn't one
2011-11-29 Andrzej ZaborowskiFix user traces link's :action parameter
2011-11-14 Tom HughesMark some strings that shouldn't be escaped as raw
2011-09-18 Tom HughesMerge branch 'master' into openstreetbugs
2011-08-24 Tom HughesMerge branch 'master' into openstreetbugs
2011-08-13 Tom HughesMerge branch 'master' into openstreetbugs
2011-07-31 Tom HughesFix an accidental CSS match that broke user popups...
2011-07-02 Tom HughesMore work on moving styles out of line and extending...
2011-07-02 Tom HughesLots more work on making RTL layout work
2011-06-22 Tom HughesMerge branch 'master' into openstreetbugs
2011-05-31 Tom HughesMerge branch 'master' into openstreetbugs
2011-05-22 Tom HughesMerge branch 'master' into openstreetbugs
2011-05-21 Tom HughesMass rename of "bugs" as "notes" for increased user...
2011-05-21 Tom HughesMerge branch 'master' into openid
2011-05-21 Tom HughesMerge branch 'master' into openstreetbugs
2011-05-06 Tom HughesMerge branch 'master' into openstreetbugs
2011-04-30 Kai KruegerMerge branch 'master' of git://git.openstreetmap.org...
2011-04-29 Tom HughesMerge remote-tracking branch 'apmon/openstreetbugs2...
2011-04-22 Kai KruegerLink the openstreetbugs browse pages
2011-04-20 Tom HughesMerge branch 'master' into openstreetbugs
2011-04-20 Kai KruegerMerge branch 'master' into openstreetbugs2
2011-04-03 Harry Woodfixes http://trac.openstreetmap.org/ticket/3645 . Can...
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 HughesMerge all the user status changing methods into one
2010-05-06 Tom HughesShow administrators the status and spam score for a...
2010-05-06 Tom HughesAdd support for suspended and confirmed users
2010-04-19 Tom HughesMerge branch 'master' into openid
2010-03-18 Kai KruegerMerge -r 20198:20540 from trunc into openstreetbugs...
2010-03-11 Tom HughesUse the small PanZoom control on the user map instead...
2010-02-28 Tom HughesAdd a "friendly" date/time format and use it whenever...
2010-02-28 Tom HughesAdd user images to diary view.
2010-02-27 Tom HughesShow the "anonymous user" picture for users with no...
2010-02-27 Tom HughesRework the user details screen to be less crap... Highl...
2010-02-27 Kai Kruegermerge 19889:20181 of rails_port into the openID branch
2010-02-27 Tom HughesRemote "change my settings" link from user page as...
2010-02-26 Tom HughesMove support for adding and deleting user images to...
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-12 Tom HughesAdd some administrator only actions to the user page.
2009-10-09 Tom HughesDisplay user's email addresses and the IP address used...
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 HughesAdd "blocks on" and "blocks by" links to the user page...
2009-10-01 Matt AmosAdding title for role icons when viewing user isn't...
2009-10-01 Ævar Arnfjörð Bjar... Add title="" to the revoke/grant icons that indicate...
next