]> git.openstreetmap.org Git - rails.git/history - app/views/user_blocks/edit.html.erb
Merge remote-tracking branch 'upstream/pull/2667'
[rails.git] / app / views / user_blocks / edit.html.erb
2020-08-05 Tom HughesMerge remote-tracking branch 'upstream/pull/2667'
2020-07-01 Andy AllanRefactor away from global form control styling
2020-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2431'
2020-02-26 Andy AllanMerge pull request #2485 from mmd-osm/patch/json2
2020-02-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2381'
2020-01-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2505'
2020-01-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2495'
2020-01-09 Tom HughesMerge remote-tracking branch 'upstream/pull/2500'
2020-01-09 Tom HughesMerge remote-tracking branch 'upstream/pull/2499'
2020-01-08 Andy AllanAvoid double-escaping display names when sent through...
2020-01-05 Tom HughesMerge remote-tracking branch 'upstream/pull/2494'
2019-12-20 Andy AllanUse _html suffix to avoid using raw when displaying...
2019-08-31 Stefan BaeblerMerge branch 'master' into tag-colour-preview-rebase
2019-08-28 Tom HughesMerge remote-tracking branch 'upstream/pull/1926'
2019-06-27 mmdMerge branch 'master' into patch/view_migration
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2207'
2019-06-18 Tom HughesMerge remote-tracking branch 'upstream/pull/2226'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2209'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2257'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2228'
2019-06-12 Andy AllanUse built-in form sumbit translation keys for user...
2019-06-10 Tom HughesMerge remote-tracking branch 'upstream/pull/2204'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2225'
2019-05-15 Andy AllanAllow user_blocks to be created for longer periods
2019-03-28 Tom HughesMerge remote-tracking branch 'upstream/pull/2190'
2019-03-27 Tom Hugheserblint: fix remaining single quoted strings
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2018-06-10 Tom HughesMerge branch 'master' into next
2018-04-29 J GuthrieMerge branch 'convert_roundabout_exits' of https:/...
2018-04-29 Jamie GuthrieMerge branch 'master' into convert_roundabout_exits
2018-04-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1809'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1833'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1839'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1838'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1837'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1836'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1835'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1834'
2018-04-25 Andy AllanUse lazy lookups for user_blocks translations
2018-04-11 Andy AllanMerge branch 'master' into moderation
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 'p' of https://github.com/jfirebaugh/opens...
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...