]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years 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.

6 years 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

6 years 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

6 years 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

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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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'

6 years 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'

6 years 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'

6 years 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'

6 years 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'

6 years 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

6 years 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.

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

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

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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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.

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

6 years 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'

6 years 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'

6 years 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'

6 years 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.

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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.

6 years 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

6 years 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'

6 years 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

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

6 years 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

6 years 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

6 years 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

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

6 years 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'

6 years 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'

6 years 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'

6 years 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'

6 years 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'

6 years 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

6 years 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

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

6 years agoRefactor message creation to use a create action
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.

6 years agoUpdate to iD v2.11.1
Bryan Housel [Wed, 29 Aug 2018 05:05:54 +0000 (01:05 -0400)]
Update to iD v2.11.1

6 years agoAlter the Makefile to be robust against bundler warnings
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

6 years agoSuppress the creation of boot logs from the ubuntu image
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.

6 years agoFix FactoryBot deprecation warnings
Tom Hughes [Tue, 28 Aug 2018 18:12:01 +0000 (19:12 +0100)]
Fix FactoryBot deprecation warnings

6 years agoUpdate bundle
Tom Hughes [Tue, 28 Aug 2018 17:57:32 +0000 (18:57 +0100)]
Update bundle

6 years agoMerge remote-tracking branch 'upstream/pull/1948'
Tom Hughes [Tue, 28 Aug 2018 17:53:45 +0000 (18:53 +0100)]
Merge remote-tracking branch 'upstream/pull/1948'

6 years agoOnly include embed related messages in the embed javascript
Tom Hughes [Tue, 28 Aug 2018 17:02:32 +0000 (18:02 +0100)]
Only include embed related messages in the embed javascript

6 years agoMerge remote-tracking branch 'upstream/pull/1950'
Tom Hughes [Tue, 28 Aug 2018 16:59:46 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/1950'

6 years agoTidy whitespace
Tom Hughes [Tue, 28 Aug 2018 16:56:02 +0000 (17:56 +0100)]
Tidy whitespace

6 years agoMerge remote-tracking branch 'upstream/pull/1958'
Tom Hughes [Tue, 28 Aug 2018 16:55:01 +0000 (17:55 +0100)]
Merge remote-tracking branch 'upstream/pull/1958'

6 years agoReverse coordinates order only when called with two nondescript numbers
Ilya Zverev [Mon, 27 Aug 2018 12:00:48 +0000 (15:00 +0300)]
Reverse coordinates order only when called with two nondescript numbers

6 years agoAdjust test for latlon searching
Ilya Zverev [Mon, 27 Aug 2018 11:27:13 +0000 (14:27 +0300)]
Adjust test for latlon searching

6 years agoAdd parsing coordinates in lon, lat format
Ilya Zverev [Mon, 27 Aug 2018 11:06:17 +0000 (14:06 +0300)]
Add parsing coordinates in lon, lat format

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Aug 2018 05:53:06 +0000 (07:53 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate to iD v2.11.0
Bryan Housel [Sun, 26 Aug 2018 06:28:16 +0000 (02:28 -0400)]
Update to iD v2.11.0

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Aug 2018 06:26:52 +0000 (08:26 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 17 Aug 2018 13:10:45 +0000 (15:10 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoOnly fetch client side translations for the current locale
Tom Hughes [Thu, 16 Aug 2018 10:49:30 +0000 (11:49 +0100)]
Only fetch client side translations for the current locale

6 years agoInclude num_changes in changeset xml response
mmd-osm [Tue, 14 Aug 2018 08:57:13 +0000 (10:57 +0200)]
Include num_changes in changeset xml response

6 years agoAvoid some accidental manouver type matches
Tom Hughes [Mon, 13 Aug 2018 16:12:48 +0000 (17:12 +0100)]
Avoid some accidental manouver type matches

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Aug 2018 06:21:06 +0000 (08:21 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoStick with autoprefixer 8.x for now
Tom Hughes [Sun, 12 Aug 2018 19:29:51 +0000 (20:29 +0100)]
Stick with autoprefixer 8.x for now

6 years agoFix bundle dependencies
Tom Hughes [Sun, 12 Aug 2018 19:06:53 +0000 (20:06 +0100)]
Fix bundle dependencies

6 years agoReplace sass-rails with sassc-rails
Tom Hughes [Sun, 12 Aug 2018 18:53:28 +0000 (19:53 +0100)]
Replace sass-rails with sassc-rails

http://sass.logdown.com/posts/7081811

6 years agoUpdate bundle
Tom Hughes [Sun, 12 Aug 2018 18:42:02 +0000 (19:42 +0100)]
Update bundle

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Aug 2018 07:34:50 +0000 (09:34 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Aug 2018 05:27:46 +0000 (07:27 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Aug 2018 08:23:36 +0000 (10:23 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoSet the locale when adding a comment to an issue
Tom Hughes [Wed, 1 Aug 2018 20:35:51 +0000 (21:35 +0100)]
Set the locale when adding a comment to an issue

6 years agoUse dynamic error pages built through the asset pipeline
Tom Hughes [Wed, 1 Aug 2018 17:56:11 +0000 (18:56 +0100)]
Use dynamic error pages built through the asset pipeline

Fixes #1241

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Jul 2018 06:28:19 +0000 (08:28 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoRemove script sources which are no longer needed by iD
Tom Hughes [Thu, 26 Jul 2018 16:44:16 +0000 (17:44 +0100)]
Remove script sources which are no longer needed by iD

6 years agoMerge remote-tracking branch 'upstream/pull/1939'
Tom Hughes [Thu, 26 Jul 2018 16:38:40 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1939'

6 years agoAdded locale
J Guthrie [Thu, 26 Jul 2018 15:32:43 +0000 (16:32 +0100)]
Added locale

6 years agoRefactored and added new test
J Guthrie [Thu, 26 Jul 2018 15:27:28 +0000 (16:27 +0100)]
Refactored and added new test

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Jul 2018 08:13:58 +0000 (10:13 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate to iD v2.10.0
Bryan Housel [Thu, 26 Jul 2018 05:38:22 +0000 (01:38 -0400)]
Update to iD v2.10.0

6 years agoReturn after rendering - stops further processing in controller
J Guthrie [Wed, 25 Jul 2018 01:30:59 +0000 (02:30 +0100)]
Return after rendering - stops further processing in controller

6 years agoSwitched if to unless to satisfy rubycop
J Guthrie [Wed, 25 Jul 2018 01:04:04 +0000 (02:04 +0100)]
Switched if to unless to satisfy rubycop

6 years agoNo trace description now redirects to /new
J Guthrie [Wed, 25 Jul 2018 00:49:51 +0000 (01:49 +0100)]
No trace description now redirects to /new

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Jul 2018 07:43:27 +0000 (09:43 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoallow moderators to read hidden notes through API
Frederik Ramm [Sun, 22 Jul 2018 13:42:14 +0000 (15:42 +0200)]
allow moderators to read hidden notes through API

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 20 Jul 2018 13:10:59 +0000 (15:10 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoAdd issues link to "More" menu for intermediate sized screens
Tom Hughes [Wed, 18 Jul 2018 17:59:52 +0000 (18:59 +0100)]
Add issues link to "More" menu for intermediate sized screens

Fixes #1928