rails.git
17 months agoUse "user" as user id parameter for notes searches
Tom Hughes [Thu, 11 Oct 2018 17:30:53 +0000 (18:30 +0100)]
Use "user" as user id parameter for notes searches

17 months agoMerge remote-tracking branch 'upstream/pull/1955'
Tom Hughes [Thu, 11 Oct 2018 16:41:47 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1955'

17 months agoSuppress changeset pagination for inactive users
Tom Hughes [Thu, 11 Oct 2018 08:33:24 +0000 (09:33 +0100)]
Suppress changeset pagination for inactive users

Fixes #2024

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Oct 2018 07:13:43 +0000 (09:13 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoFix Rubocop issue
ENT8R [Thu, 11 Oct 2018 06:36:13 +0000 (08:36 +0200)]
Fix Rubocop issue

17 months agoFix some issues and improve code
ENT8R [Wed, 10 Oct 2018 17:29:11 +0000 (19:29 +0200)]
Fix some issues and improve code

17 months agoMake paragraph breaks more visible in changeset and note comments
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

17 months agoFix Rubocop issue
ENT8R [Tue, 9 Oct 2018 12:50:55 +0000 (14:50 +0200)]
Fix Rubocop issue

17 months agoFix an issue where the query did not work if a display name or an id was specified
ENT8R [Tue, 9 Oct 2018 12:37:55 +0000 (14:37 +0200)]
Fix an issue where the query did not work if a display name or an id was specified

17 months agoMerge branch 'master' into notes-search
ENT8R [Tue, 9 Oct 2018 09:41:22 +0000 (11:41 +0200)]
Merge branch 'master' into notes-search

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 9 Oct 2018 08:29:33 +0000 (10:29 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoRename CSS class matches for change in controller name
Tom Hughes [Thu, 4 Oct 2018 21:32:10 +0000 (22:32 +0100)]
Rename CSS class matches for change in controller name

17 months agoRemove temorary routes
Tom Hughes [Wed, 3 Oct 2018 21:50:43 +0000 (22:50 +0100)]
Remove temorary routes

17 months agoImprove formatting
Tom Hughes [Wed, 3 Oct 2018 21:39:27 +0000 (22:39 +0100)]
Improve formatting

17 months agoMerge remote-tracking branch 'upstream/pull/2010'
Tom Hughes [Wed, 3 Oct 2018 21:39:17 +0000 (22:39 +0100)]
Merge remote-tracking branch 'upstream/pull/2010'

17 months agoUpdated min bounds algorithm
J Guthrie [Wed, 3 Oct 2018 21:07:20 +0000 (22:07 +0100)]
Updated min bounds algorithm

17 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Wed, 3 Oct 2018 20:18:47 +0000 (22:18 +0200)]
Localisation updates from https://translatewiki.net.

17 months agoMerge remote-tracking branch 'upstream/pull/2014'
Tom Hughes [Wed, 3 Oct 2018 17:59:33 +0000 (18:59 +0100)]
Merge remote-tracking branch 'upstream/pull/2014'

17 months agoMerge remote-tracking branch 'upstream/pull/2012'
Tom Hughes [Wed, 3 Oct 2018 17:54:19 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2012'

17 months agoRename user_controller to users_controller
Andy Allan [Wed, 3 Oct 2018 13:31:10 +0000 (15:31 +0200)]
Rename user_controller to users_controller

17 months agoRemove rubocop reference to quad_tile code
Andy Allan [Wed, 3 Oct 2018 12:07:10 +0000 (14:07 +0200)]
Remove rubocop reference to quad_tile code

17 months agoMerge branch 'master' into messages
Andy Allan [Wed, 3 Oct 2018 12:04:12 +0000 (14:04 +0200)]
Merge branch 'master' into messages

17 months agoBump max blocklength for additional routes
Andy Allan [Wed, 3 Oct 2018 12:00:38 +0000 (14:00 +0200)]
Bump max blocklength for additional routes

17 months agoChangeset boundary is enlarged if it was on a single point
J Guthrie [Tue, 2 Oct 2018 22:56:42 +0000 (23:56 +0100)]
Changeset boundary is enlarged if it was on a single point

18 months agoUse sshfs in preference to nfs for vagrant file sharing
Tom Hughes [Fri, 28 Sep 2018 18:51:26 +0000 (19:51 +0100)]
Use sshfs in preference to nfs for vagrant file sharing

18 months agoUpdate vagrant config to use Ubuntu 18.04
Tom Hughes [Fri, 28 Sep 2018 18:51:09 +0000 (19:51 +0100)]
Update vagrant config to use Ubuntu 18.04

18 months agoUpdate wiki page data
Tom Hughes [Wed, 26 Sep 2018 22:28:40 +0000 (23:28 +0100)]
Update wiki page data

18 months agoStop wiki update script trying to be "helpful"
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

18 months agoFix any_relations always being false
Xuyang Jia [Sat, 22 Sep 2018 16:40:44 +0000 (17:40 +0100)]
Fix any_relations always being false

Closes #1976

18 months agoFix Style/NumericPredicate rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:34:58 +0000 (17:34 +0100)]
Fix Style/NumericPredicate rubocop warnings

18 months agoFix Style/SafeNavigation rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:21:06 +0000 (17:21 +0100)]
Fix Style/SafeNavigation rubocop warnings

18 months agoFix new rubocop warnings
Tom Hughes [Sat, 22 Sep 2018 16:12:29 +0000 (17:12 +0100)]
Fix new rubocop warnings

18 months agoUpdate bundle
Tom Hughes [Sat, 22 Sep 2018 16:08:49 +0000 (17:08 +0100)]
Update bundle

18 months agoMerge remote-tracking branch 'upstream/pull/2000'
Tom Hughes [Sat, 22 Sep 2018 16:03:50 +0000 (17:03 +0100)]
Merge remote-tracking branch 'upstream/pull/2000'

18 months agoMerge remote-tracking branch 'upstream/pull/2001'
Tom Hughes [Sat, 22 Sep 2018 16:02:50 +0000 (17:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2001'

18 months agoRemove Imperial from hosting credits
Tom Hughes [Sat, 22 Sep 2018 15:57:53 +0000 (16:57 +0100)]
Remove Imperial from hosting credits

Fixes #1944

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Sep 2018 09:16:54 +0000 (11:16 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoFix incorrect reference to 12.04 in installation notes
Andy Allan [Wed, 19 Sep 2018 13:34:49 +0000 (14:34 +0100)]
Fix incorrect reference to 12.04 in installation notes

18 months agoSet the rubocop target version to 2.3
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

18 months agoRemove bogus translation
Tom Hughes [Thu, 13 Sep 2018 18:36:32 +0000 (19:36 +0100)]
Remove bogus translation

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Sep 2018 06:17:04 +0000 (08:17 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoRemove bogus translation
Tom Hughes [Thu, 13 Sep 2018 18:36:32 +0000 (19:36 +0100)]
Remove bogus translation

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Sep 2018 09:04:58 +0000 (11:04 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoTest that friends are shown correctly on the user profile
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

18 months agoSet img.button size to 20x20 for directions.png
mmd-osm [Tue, 11 Sep 2018 17:47:42 +0000 (19:47 +0200)]
Set img.button size to 20x20 for directions.png

18 months agoUpdate translation keys for renaming of user#view to user#show
Tom Hughes [Tue, 11 Sep 2018 15:33:46 +0000 (16:33 +0100)]
Update translation keys for renaming of user#view to user#show

18 months agoUpdate bundle
Tom Hughes [Mon, 10 Sep 2018 21:40:21 +0000 (22:40 +0100)]
Update bundle

18 months agoUpdate bowser to 1.9.4
Tom Hughes [Mon, 10 Sep 2018 21:33:46 +0000 (22:33 +0100)]
Update bowser to 1.9.4

18 months agoUpdate leaflet to 1.3.4
Tom Hughes [Mon, 10 Sep 2018 21:30:01 +0000 (22:30 +0100)]
Update leaflet to 1.3.4

18 months agoAvoid flickering welcome banner
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

18 months agoLimit map to the maximum zoom of the current base layer
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

18 months agoMerge remote-tracking branch 'upstream/pull/1987'
Tom Hughes [Mon, 10 Sep 2018 18:09:31 +0000 (19:09 +0100)]
Merge remote-tracking branch 'upstream/pull/1987'

18 months agoMerge remote-tracking branch 'upstream/pull/1986'
Tom Hughes [Mon, 10 Sep 2018 18:01:28 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/1986'

18 months agoMerge remote-tracking branch 'upstream/pull/1985'
Tom Hughes [Mon, 10 Sep 2018 17:58:27 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/1985'

18 months agoMerge remote-tracking branch 'upstream/pull/1984'
Tom Hughes [Mon, 10 Sep 2018 17:53:13 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1984'

18 months agoMerge remote-tracking branch 'upstream/pull/1983'
Tom Hughes [Mon, 10 Sep 2018 17:53:09 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1983'

18 months agoRename CSS class matches for changes in action names
Tom Hughes [Mon, 10 Sep 2018 13:11:19 +0000 (14:11 +0100)]
Rename CSS class matches for changes in action names

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Sep 2018 06:30:56 +0000 (08:30 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoResolve 34 Rubocop Lint/AmbiguousOperator conflicts
Wil [Fri, 8 Jun 2018 19:02:03 +0000 (15:02 -0400)]
Resolve 34 Rubocop Lint/AmbiguousOperator conflicts

18 months agoRemove Lint/ShadowingOuterLocalVariable - already fixed
Andy Allan [Mon, 10 Sep 2018 03:34:04 +0000 (11:34 +0800)]
Remove Lint/ShadowingOuterLocalVariable - already fixed

18 months agoResolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts
Wil [Fri, 8 Jun 2018 19:51:17 +0000 (15:51 -0400)]
Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts

18 months agoJust pass the object, rather than the id, to _path methods where possible
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

18 months agoJust pass the user object, rather than the display_name, to the user_path helper
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

18 months agoRename diary_entry#list to #index
Andy Allan [Mon, 10 Sep 2018 02:26:28 +0000 (10:26 +0800)]
Rename diary_entry#list to #index

18 months agoRename user#list to user#index
Andy Allan [Mon, 10 Sep 2018 02:03:34 +0000 (10:03 +0800)]
Rename user#list to user#index

18 months agoUse full url escaping when required in trace tests
Andy Allan [Mon, 10 Sep 2018 01:37:52 +0000 (09:37 +0800)]
Use full url escaping when required in trace tests

18 months agoUpdate changeset browse view for renaming of changeset#list to changeset#index
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

18 months agoUpdate trace RSS for renaming of trace#view to trace#show
Tom Hughes [Sun, 9 Sep 2018 10:49:37 +0000 (11:49 +0100)]
Update trace RSS for renaming of trace#view to trace#show

18 months agoImprove tests for trace RSS feeds
Tom Hughes [Sun, 9 Sep 2018 10:49:04 +0000 (11:49 +0100)]
Improve tests for trace RSS feeds

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Sep 2018 19:37:01 +0000 (21:37 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoFix rubocop warnings
Tom Hughes [Wed, 5 Sep 2018 18:33:54 +0000 (19:33 +0100)]
Fix rubocop warnings

18 months agoMerge remote-tracking branch 'upstream/pull/1974'
Tom Hughes [Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/1974'

18 months agoMerge remote-tracking branch 'upstream/pull/1973'
Tom Hughes [Wed, 5 Sep 2018 18:01:24 +0000 (19:01 +0100)]
Merge remote-tracking branch 'upstream/pull/1973'

18 months agoMerge remote-tracking branch 'upstream/pull/1972'
Tom Hughes [Wed, 5 Sep 2018 17:41:17 +0000 (18:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1972'

18 months agoRemove temporary routes
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.

18 months agoRename changeset#list to changeset#index
Andy Allan [Wed, 5 Sep 2018 07:17:11 +0000 (15:17 +0800)]
Rename changeset#list to changeset#index

18 months agoRename diary_entry#view to diary_entry#show
Andy Allan [Wed, 5 Sep 2018 06:52:36 +0000 (14:52 +0800)]
Rename diary_entry#view to diary_entry#show

18 months agoRename user#view to user#show
Andy Allan [Wed, 5 Sep 2018 06:21:01 +0000 (14:21 +0800)]
Rename user#view to user#show

18 months agoUse resourceful routing for message replies
Andy Allan [Wed, 5 Sep 2018 03:25:44 +0000 (11:25 +0800)]
Use resourceful routing for message replies

18 months agoUse a resourceful path for message marking
Andy Allan [Wed, 5 Sep 2018 03:02:56 +0000 (11:02 +0800)]
Use a resourceful path for message marking

18 months agoUse resourceful destroy method for messages
Andy Allan [Wed, 5 Sep 2018 02:38:36 +0000 (10:38 +0800)]
Use resourceful destroy method for messages

18 months agoHide note comments made by deleted users
Tom Hughes [Tue, 4 Sep 2018 21:22:13 +0000 (22:22 +0100)]
Hide note comments made by deleted users

Fixes #1970

18 months agoDo not display two coordinates on 'where am I' click
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

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Sep 2018 06:23:19 +0000 (08:23 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoRequire people replying to diary notifications to be subscribed
Tom Hughes [Thu, 30 Aug 2018 17:34:15 +0000 (18:34 +0100)]
Require people replying to diary notifications to be subscribed

19 months agoMerge remote-tracking branch 'upstream/pull/1964'
Tom Hughes [Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/1964'

19 months agoPut the resourceful routing at the top of the list, for clarity
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

19 months agoRename i18n keys track->trace
Andy Allan [Wed, 29 Aug 2018 09:59:58 +0000 (17:59 +0800)]
Rename i18n keys track->trace

19 months agoRename traces#list to traces#index
Andy Allan [Wed, 29 Aug 2018 09:58:37 +0000 (17:58 +0800)]
Rename traces#list to traces#index

19 months agoRename traces#view to traces#show
Andy Allan [Wed, 29 Aug 2018 09:43:34 +0000 (17:43 +0800)]
Rename traces#view to traces#show

19 months agoSplit out updating a trace into an update action
Andy Allan [Wed, 29 Aug 2018 09:31:12 +0000 (17:31 +0800)]
Split out updating a trace into an update action

19 months agoAvoid multiple returns
Tom Hughes [Wed, 29 Aug 2018 07:47:02 +0000 (08:47 +0100)]
Avoid multiple returns

19 months agoMerge remote-tracking branch 'upstream/pull/1962'
Tom Hughes [Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)]
Merge remote-tracking branch 'upstream/pull/1962'

19 months agoMerge remote-tracking branch 'upstream/pull/1963'
Tom Hughes [Wed, 29 Aug 2018 07:43:28 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/1963'

19 months agoMerge remote-tracking branch 'upstream/pull/1960'
Tom Hughes [Wed, 29 Aug 2018 07:43:08 +0000 (08:43 +0100)]
Merge remote-tracking branch 'upstream/pull/1960'

19 months agoMerge remote-tracking branch 'upstream/pull/1959'
Tom Hughes [Wed, 29 Aug 2018 07:42:39 +0000 (08:42 +0100)]
Merge remote-tracking branch 'upstream/pull/1959'

19 months agoMerge remote-tracking branch 'upstream/pull/1961'
Tom Hughes [Wed, 29 Aug 2018 07:36:22 +0000 (08:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1961'

19 months agoTidy up control flow in trace creation
Tom Hughes [Wed, 29 Aug 2018 07:34:38 +0000 (08:34 +0100)]
Tidy up control flow in trace creation

19 months agoMerge pull request #1938 from jguthrie100/fix_no_trace_description_error
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

19 months agoFix whitespace in locale file
Andy Allan [Wed, 29 Aug 2018 06:24:23 +0000 (14:24 +0800)]
Fix whitespace in locale file