rails.git
19 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

19 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

19 months 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.

19 months 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

19 months 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

19 months 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.

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

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

19 months 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'

19 months 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

19 months 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'

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

19 months 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'

19 months 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

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

19 months 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

19 months 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.

19 months 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

19 months 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.

19 months 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.

19 months 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

19 months 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

19 months 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

19 months 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.

19 months 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

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

19 months 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

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

19 months 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.

20 months 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.

20 months 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.

20 months 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

20 months 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

20 months 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.

20 months 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

20 months 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'

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

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

20 months 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.

20 months 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

20 months 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

20 months 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

20 months 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

20 months 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.

20 months 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

20 months 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.

20 months 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

20 months agoUpdate leaflet to 1.3.3
Tom Hughes [Wed, 18 Jul 2018 17:42:15 +0000 (18:42 +0100)]
Update leaflet to 1.3.3

20 months agoUpdate leaflet.osm plugin
Tom Hughes [Tue, 17 Jul 2018 21:48:45 +0000 (22:48 +0100)]
Update leaflet.osm plugin

20 months agoUpdate leaflet to 1.3.2
Tom Hughes [Tue, 17 Jul 2018 21:47:50 +0000 (22:47 +0100)]
Update leaflet to 1.3.2

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Jul 2018 15:02:36 +0000 (17:02 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoBlock non-localhost requests for all tests
Tom Hughes [Tue, 10 Jul 2018 17:59:15 +0000 (18:59 +0100)]
Block non-localhost requests for all tests

Only blocking them for the system tests didn't actually
work anyway as the setting is global so would apply to all
tests after the first system test.

20 months agoFix nominatim stubs
Tom Hughes [Tue, 10 Jul 2018 17:50:29 +0000 (18:50 +0100)]
Fix nominatim stubs

20 months agoAdd /api/0.6/users to fetch multiple users
Tom Hughes [Mon, 9 Jul 2018 21:19:10 +0000 (22:19 +0100)]
Add /api/0.6/users to fetch multiple users

Fixes #1921

20 months agoFix another hostip stub
Tom Hughes [Mon, 9 Jul 2018 19:36:41 +0000 (20:36 +0100)]
Fix another hostip stub

20 months agoReturn the "large" image from the user details API call
Tom Hughes [Mon, 9 Jul 2018 19:26:37 +0000 (20:26 +0100)]
Return the "large" image from the user details API call

Closes #1923

20 months agoFix stubbing of hostip requests
Tom Hughes [Mon, 9 Jul 2018 19:15:42 +0000 (20:15 +0100)]
Fix stubbing of hostip requests

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Jul 2018 11:52:34 +0000 (13:52 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Jul 2018 06:05:23 +0000 (08:05 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoConvert some URLs to https
Tom Hughes [Fri, 29 Jun 2018 10:46:54 +0000 (11:46 +0100)]
Convert some URLs to https

21 months agoUpdate to iD v2.9.2
Bryan Housel [Thu, 28 Jun 2018 23:23:18 +0000 (19:23 -0400)]
Update to iD v2.9.2

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Jun 2018 05:32:30 +0000 (07:32 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate to iD v2.9.1
Bryan Housel [Tue, 26 Jun 2018 01:37:25 +0000 (21:37 -0400)]
Update to iD v2.9.1

21 months agoUpdate bundle
Tom Hughes [Mon, 25 Jun 2018 13:35:10 +0000 (14:35 +0100)]
Update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Jun 2018 06:20:29 +0000 (08:20 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoRemove expired banners
Tom Hughes [Fri, 22 Jun 2018 10:59:49 +0000 (11:59 +0100)]
Remove expired banners

21 months agoAdd SotM 2018 banner
Francesco Frassinelli [Mon, 18 Jun 2018 14:30:53 +0000 (16:30 +0200)]
Add SotM 2018 banner

Closes #1905

21 months agoUpdate bundle
Tom Hughes [Wed, 20 Jun 2018 10:34:35 +0000 (11:34 +0100)]
Update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Jun 2018 06:26:23 +0000 (08:26 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoFix daily cleanup script for rails 5.2 compatibility
Tom Hughes [Wed, 20 Jun 2018 07:51:11 +0000 (08:51 +0100)]
Fix daily cleanup script for rails 5.2 compatibility

21 months agoUpdate (as far as possible) to rails 5.2 default configuration
Tom Hughes [Tue, 19 Jun 2018 17:53:08 +0000 (18:53 +0100)]
Update (as far as possible) to rails 5.2 default configuration

21 months agoFix rubocop warnings
Tom Hughes [Tue, 19 Jun 2018 08:05:32 +0000 (09:05 +0100)]
Fix rubocop warnings

21 months agoUpdate to rails 5.2.0
Tom Hughes [Mon, 18 Jun 2018 19:46:00 +0000 (20:46 +0100)]
Update to rails 5.2.0

21 months agoUpdate to rails 5.1.6
Tom Hughes [Mon, 18 Jun 2018 08:14:50 +0000 (09:14 +0100)]
Update to rails 5.1.6

21 months agoFix new rubocop warnings
Tom Hughes [Mon, 18 Jun 2018 08:00:49 +0000 (09:00 +0100)]
Fix new rubocop warnings

21 months agoUpdate bundle
Tom Hughes [Mon, 18 Jun 2018 07:55:34 +0000 (08:55 +0100)]
Update bundle

21 months agoFix broken translation
Tom Hughes [Mon, 18 Jun 2018 07:51:33 +0000 (08:51 +0100)]
Fix broken translation

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Jun 2018 06:05:22 +0000 (08:05 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoAllow inline javascript and CSS in better_errors pages
Tom Hughes [Sun, 17 Jun 2018 10:33:04 +0000 (11:33 +0100)]
Allow inline javascript and CSS in better_errors pages

21 months agoAssign vandalism reports for users to moderators
Tom Hughes [Sun, 17 Jun 2018 10:14:19 +0000 (11:14 +0100)]
Assign vandalism reports for users to moderators

21 months agoOnly include issues visible to the current user in the count
Tom Hughes [Sun, 17 Jun 2018 00:01:24 +0000 (01:01 +0100)]
Only include issues visible to the current user in the count

21 months agoAvoid using "other" as a translation key
Tom Hughes [Sat, 16 Jun 2018 15:21:07 +0000 (16:21 +0100)]
Avoid using "other" as a translation key

21 months agoFix typoed expansion variable in translation
Tom Hughes [Sat, 16 Jun 2018 11:52:23 +0000 (12:52 +0100)]
Fix typoed expansion variable in translation

21 months agoShow count of open issues in the header
Tom Hughes [Sat, 16 Jun 2018 11:40:15 +0000 (12:40 +0100)]
Show count of open issues in the header