]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 10 Oct 2018 09:40:41 +0000 (11:40 +0200)]
Change abilities based on upstream renamings
Andy Allan [Wed, 10 Oct 2018 09:26:30 +0000 (11:26 +0200)]
Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz
Tom Hughes [Tue, 9 Oct 2018 14:14:35 +0000 (15:14 +0100)]
Make paragraph breaks more visible in changeset and note comments
Fixes #2022
translatewiki.net [Tue, 9 Oct 2018 08:29:33 +0000 (10:29 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 4 Oct 2018 21:32:10 +0000 (22:32 +0100)]
Rename CSS class matches for change in controller name
Tom Hughes [Wed, 3 Oct 2018 21:50:43 +0000 (22:50 +0100)]
Remove temorary routes
Tom Hughes [Wed, 3 Oct 2018 21:39:27 +0000 (22:39 +0100)]
Improve formatting
Tom Hughes [Wed, 3 Oct 2018 21:39:17 +0000 (22:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2010'
J Guthrie [Wed, 3 Oct 2018 21:07:20 +0000 (22:07 +0100)]
Updated min bounds algorithm
translatewiki.net [Wed, 3 Oct 2018 20:18:47 +0000 (22:18 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/2014'
Tom Hughes [Wed, 3 Oct 2018 17:54:19 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2012'
Andy Allan [Wed, 3 Oct 2018 13:31:10 +0000 (15:31 +0200)]
Rename user_controller to users_controller
Andy Allan [Wed, 3 Oct 2018 12:07:10 +0000 (14:07 +0200)]
Remove rubocop reference to quad_tile code
Andy Allan [Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)]
Merge branch 'master' into messages
Andy Allan [Wed, 3 Oct 2018 12:00:38 +0000 (14:00 +0200)]
Bump max blocklength for additional routes
J Guthrie [Tue, 2 Oct 2018 22:56:42 +0000 (23:56 +0100)]
Changeset boundary is enlarged if it was on a single point
Tom Hughes [Fri, 28 Sep 2018 18:51:26 +0000 (19:51 +0100)]
Use sshfs in preference to nfs for vagrant file sharing
Tom Hughes [Fri, 28 Sep 2018 18:51:09 +0000 (19:51 +0100)]
Update vagrant config to use Ubuntu 18.04
Tom Hughes [Wed, 26 Sep 2018 22:28:40 +0000 (23:28 +0100)]
Update wiki page data
Tom Hughes [Wed, 26 Sep 2018 21:43:30 +0000 (22:43 +0100)]
Stop wiki update script trying to be "helpful"
Instead of trying to advise how to import some (but not all) of
the modules, just require them in the normal way.
Closes #1763
Xuyang Jia [Sat, 22 Sep 2018 16:40:44 +0000 (17:40 +0100)]
Fix any_relations always being false
Closes #1976
Tom Hughes [Sat, 22 Sep 2018 16:34:58 +0000 (17:34 +0100)]
Fix Style/NumericPredicate rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:21:06 +0000 (17:21 +0100)]
Fix Style/SafeNavigation rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:12:29 +0000 (17:12 +0100)]
Fix new rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:08:49 +0000 (17:08 +0100)]
Update bundle
Tom Hughes [Sat, 22 Sep 2018 16:03:50 +0000 (17:03 +0100)]
Merge remote-tracking branch 'upstream/pull/2000'
Tom Hughes [Sat, 22 Sep 2018 16:02:50 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2001'
Tom Hughes [Sat, 22 Sep 2018 15:57:53 +0000 (16:57 +0100)]
Remove Imperial from hosting credits
Fixes #1944
translatewiki.net [Thu, 20 Sep 2018 09:16:54 +0000 (11:16 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 19 Sep 2018 13:34:49 +0000 (14:34 +0100)]
Fix incorrect reference to 12.04 in installation notes
Andy Allan [Wed, 19 Sep 2018 13:25:31 +0000 (14:25 +0100)]
Set the rubocop target version to 2.3
This allows rubocop to run additional cops that would not apply to
older ruby versions
Tom Hughes [Thu, 13 Sep 2018 18:36:32 +0000 (19:36 +0100)]
Remove bogus translation
translatewiki.net [Mon, 17 Sep 2018 06:17:04 +0000 (08:17 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 13 Sep 2018 18:36:32 +0000 (19:36 +0100)]
Remove bogus translation
translatewiki.net [Thu, 13 Sep 2018 09:04:58 +0000 (11:04 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Sep 2018 16:57:09 +0000 (17:57 +0100)]
Test that friends are shown correctly on the user profile
Fixes #1992
mmd-osm [Tue, 11 Sep 2018 17:47:42 +0000 (19:47 +0200)]
Set img.button size to 20x20 for directions.png
Tom Hughes [Tue, 11 Sep 2018 15:33:46 +0000 (16:33 +0100)]
Update translation keys for renaming of user#view to user#show
Tom Hughes [Mon, 10 Sep 2018 21:40:21 +0000 (22:40 +0100)]
Update bundle
Tom Hughes [Mon, 10 Sep 2018 21:33:46 +0000 (22:33 +0100)]
Update bowser to 1.9.4
Tom Hughes [Mon, 10 Sep 2018 21:30:01 +0000 (22:30 +0100)]
Update leaflet to 1.3.4
Tom Hughes [Mon, 10 Sep 2018 20:21:43 +0000 (21:21 +0100)]
Avoid flickering welcome banner
Make the welcome banner default to being hidden and then show
it (by adding a class) if there is no cookie.
Fixes #1951
Tom Hughes [Mon, 10 Sep 2018 19:37:36 +0000 (20:37 +0100)]
Limit map to the maximum zoom of the current base layer
Fix maximum zoom levels for various layers and ensure that the
map can't be zoomed beyond the limit of the current base layer.
Fixes #1978
Tom Hughes [Mon, 10 Sep 2018 18:09:31 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/1987'
Tom Hughes [Mon, 10 Sep 2018 18:01:28 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/1986'
Tom Hughes [Mon, 10 Sep 2018 17:58:27 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/1985'
Tom Hughes [Mon, 10 Sep 2018 17:53:13 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1984'
Tom Hughes [Mon, 10 Sep 2018 17:53:09 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1983'
Tom Hughes [Mon, 10 Sep 2018 13:11:19 +0000 (14:11 +0100)]
Rename CSS class matches for changes in action names
translatewiki.net [Mon, 10 Sep 2018 06:30:56 +0000 (08:30 +0200)]
Localisation updates from https://translatewiki.net.
Wil [Fri, 8 Jun 2018 19:02:03 +0000 (15:02 -0400)]
Resolve 34 Rubocop Lint/AmbiguousOperator conflicts
Andy Allan [Mon, 10 Sep 2018 03:34:04 +0000 (11:34 +0800)]
Remove Lint/ShadowingOuterLocalVariable - already fixed
Wil [Fri, 8 Jun 2018 19:51:17 +0000 (15:51 -0400)]
Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts
Andy Allan [Mon, 10 Sep 2018 03:09:19 +0000 (11:09 +0800)]
Just pass the object, rather than the id, to _path methods where possible
Andy Allan [Mon, 10 Sep 2018 02:54:29 +0000 (10:54 +0800)]
Just pass the user object, rather than the display_name, to the user_path helper
Andy Allan [Mon, 10 Sep 2018 02:26:28 +0000 (10:26 +0800)]
Rename diary_entry#list to #index
Andy Allan [Mon, 10 Sep 2018 02:03:34 +0000 (10:03 +0800)]
Rename user#list to user#index
Andy Allan [Mon, 10 Sep 2018 01:37:52 +0000 (09:37 +0800)]
Use full url escaping when required in trace tests
Tom Hughes [Sun, 9 Sep 2018 11:36:34 +0000 (12:36 +0100)]
Update changeset browse view for renaming of changeset#list to changeset#index
Tom Hughes [Sun, 9 Sep 2018 10:49:37 +0000 (11:49 +0100)]
Update trace RSS for renaming of trace#view to trace#show
Tom Hughes [Sun, 9 Sep 2018 10:49:04 +0000 (11:49 +0100)]
Improve tests for trace RSS feeds
translatewiki.net [Thu, 6 Sep 2018 19:37:01 +0000 (21:37 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 5 Sep 2018 18:33:54 +0000 (19:33 +0100)]
Fix rubocop warnings
Tom Hughes [Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/1974'
Tom Hughes [Wed, 5 Sep 2018 18:01:24 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/1973'
Tom Hughes [Wed, 5 Sep 2018 17:41:17 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1972'
Andy Allan [Wed, 5 Sep 2018 07:36:25 +0000 (15:36 +0800)]
Remove temporary routes
These were preserved to avoid users hitting errors, if we deployed
while they were filling in the related forms.
Andy Allan [Wed, 5 Sep 2018 07:17:11 +0000 (15:17 +0800)]
Rename changeset#list to changeset#index
Andy Allan [Wed, 5 Sep 2018 06:52:36 +0000 (14:52 +0800)]
Rename diary_entry#view to diary_entry#show
Andy Allan [Wed, 5 Sep 2018 06:21:01 +0000 (14:21 +0800)]
Rename user#view to user#show
Andy Allan [Wed, 5 Sep 2018 03:25:44 +0000 (11:25 +0800)]
Use resourceful routing for message replies
Andy Allan [Wed, 5 Sep 2018 03:02:56 +0000 (11:02 +0800)]
Use a resourceful path for message marking
Andy Allan [Wed, 5 Sep 2018 02:38:36 +0000 (10:38 +0800)]
Use resourceful destroy method for messages
Tom Hughes [Tue, 4 Sep 2018 21:22:13 +0000 (22:22 +0100)]
Hide note comments made by deleted users
Fixes #1970
Ilya Zverev [Mon, 3 Sep 2018 09:05:25 +0000 (12:05 +0300)]
Do not display two coordinates on 'where am I' click
Closes #1968
translatewiki.net [Mon, 3 Sep 2018 06:23:19 +0000 (08:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 30 Aug 2018 17:34:15 +0000 (18:34 +0100)]
Require people replying to diary notifications to be subscribed
Tom Hughes [Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/1964'
Andy Allan [Thu, 30 Aug 2018 01:48:57 +0000 (09:48 +0800)]
Put the resourceful routing at the top of the list, for clarity
Andy Allan [Wed, 29 Aug 2018 09:59:58 +0000 (17:59 +0800)]
Rename i18n keys track->trace
Andy Allan [Wed, 29 Aug 2018 09:58:37 +0000 (17:58 +0800)]
Rename traces#list to traces#index
Andy Allan [Wed, 29 Aug 2018 09:43:34 +0000 (17:43 +0800)]
Rename traces#view to traces#show
Andy Allan [Wed, 29 Aug 2018 09:31:12 +0000 (17:31 +0800)]
Split out updating a trace into an update action
Tom Hughes [Wed, 29 Aug 2018 07:47:02 +0000 (08:47 +0100)]
Avoid multiple returns
Tom Hughes [Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/1962'
Tom Hughes [Wed, 29 Aug 2018 07:43:28 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/1963'
Tom Hughes [Wed, 29 Aug 2018 07:43:08 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/1960'
Tom Hughes [Wed, 29 Aug 2018 07:42:39 +0000 (08:42 +0100)]
Merge remote-tracking branch 'upstream/pull/1959'
Tom Hughes [Wed, 29 Aug 2018 07:36:22 +0000 (08:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1961'
Tom Hughes [Wed, 29 Aug 2018 07:34:38 +0000 (08:34 +0100)]
Tidy up control flow in trace creation
Andy Allan [Wed, 29 Aug 2018 06:49:26 +0000 (14:49 +0800)]
Merge pull request #1938 from jguthrie100/fix_no_trace_description_error
Fixes "new trace" validation error
Andy Allan [Wed, 29 Aug 2018 06:24:23 +0000 (14:24 +0800)]
Fix whitespace in locale file
Andy Allan [Wed, 29 Aug 2018 06:18:20 +0000 (14:18 +0800)]
Refactor message creation to use a create action
This makes it more conventional, rather than handling posts to the new action. The posting of the form was also reworked to use a hidden field for the displayname, rather than in the url, again for convention.
Bryan Housel [Wed, 29 Aug 2018 05:05:54 +0000 (01:05 -0400)]
Update to iD v2.11.1
Andy Allan [Wed, 29 Aug 2018 04:36:31 +0000 (12:36 +0800)]
Alter the Makefile to be robust against bundler warnings
In bundle < 2.0, warnings are printed to stdout, along with the path information
that we need. This takes the final line of the output and assumes it's the path.
Fixes #1930
Andy Allan [Wed, 29 Aug 2018 03:43:22 +0000 (11:43 +0800)]
Suppress the creation of boot logs from the ubuntu image
The ubuntu image by default creates a logfile during each boot, but this
is uninteresting for our workflow. This switch suppresses the log.
Tom Hughes [Tue, 28 Aug 2018 18:12:01 +0000 (19:12 +0100)]
Fix FactoryBot deprecation warnings
Tom Hughes [Tue, 28 Aug 2018 17:57:32 +0000 (18:57 +0100)]
Update bundle
Tom Hughes [Tue, 28 Aug 2018 17:53:45 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1948'