Merge remote-tracking branch 'upstream/pull/1824'
[rails.git] / app / views / user_blocks / show.html.erb
2018-03-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1788'
2018-03-21 Andy AllanUse user_path links. Fixes #1785
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-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1580'
2017-08-02 Andy AllanMerge pull request #1588 from Georeactor/master
2017-08-02 Tom HughesMerge remote-tracking branch 'upstream/pull/1603'
2017-07-27 Tom HughesMerge remote-tracking branch 'upstream/pull/1595'
2017-07-27 Andy AllanUse a current_user helper for accessing the logged...
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-06-25 Tom HughesImprove display of user block timestamps
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-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-17 Tom HughesTreat all newly entered blocks of text as Markdown
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-23 Tom HughesDon't escape the heading on a user block
2010-01-04 Tom HughesFormat block details more nicely.
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-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 Ævar Arnfjörð Bjar... Oops. Mixed up heading/title
2009-10-01 Ævar Arnfjörð Bjar... Set title on /blocks/:id and link to usernames
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-09-29 Matt AmosNew migration to add better auditing to user_roles...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...