]> git.openstreetmap.org Git - rails.git/history - app/views/user_blocks/edit.html.erb
Resolve conflict
[rails.git] / app / views / user_blocks / edit.html.erb
2013-07-08 Thomas LevineStandardize submit tags
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-19 Tom HughesHandle reason as a rich text area when editing a block
2012-03-10 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-09 Tom HughesDon't escape the heading as it contains a link
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesUse <%= instead of <% for block helpers that use concat
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... Set a limit on the new/edit block text area. Make it...
2009-10-01 Ævar Arnfjörð Bjar... use h() to avoid XSS in usernames
2009-10-01 Ævar Arnfjörð Bjar... title/heading & XSS fix for /edit
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-09-30 Matt AmosTried to DRY the user_blocks controller. Moved the...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...