]> git.openstreetmap.org Git - rails.git/log
rails.git
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 agoAdd some more tests, better error handling for dates
ENT8R [Mon, 27 Aug 2018 14:44:46 +0000 (16:44 +0200)]
Add some more tests, better error handling for dates

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 agoAdd some more tests
ENT8R [Sun, 26 Aug 2018 17:06:01 +0000 (19:06 +0200)]
Add some more tests

6 years agoImprove code style, fix tests
ENT8R [Sun, 26 Aug 2018 14:04:09 +0000 (16:04 +0200)]
Improve code style, fix tests

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 agoEnhanced the notes search endpoint with a few features
ENT8R [Sat, 25 Aug 2018 21:00:11 +0000 (23:00 +0200)]
Enhanced the notes search endpoint with a few features

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Closes #1905

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6 years agoSet the locale for issue and report views
Tom Hughes [Sat, 16 Jun 2018 11:14:58 +0000 (12:14 +0100)]
Set the locale for issue and report views

6 years agoMerge remote-tracking branch 'upstream/pull/1576'
Tom Hughes [Sat, 16 Jun 2018 10:45:23 +0000 (11:45 +0100)]
Merge remote-tracking branch 'upstream/pull/1576'

6 years agoRemove quad_tile library and extract to gem
Benjamin Reynolds [Thu, 14 Jun 2018 17:25:35 +0000 (18:25 +0100)]
Remove quad_tile library and extract to gem

Quad tile functions are now installed via a gem with native extension
automatically. This improves the run time of the test suite by ~30% for
users that didn't bother to build the C version of the functions.

Closes #1314
Closes #1899

6 years agoUpdate to iD v2.9.0
Bryan Housel [Thu, 14 Jun 2018 12:45:39 +0000 (08:45 -0400)]
Update to iD v2.9.0

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Jun 2018 10:35:47 +0000 (12:35 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoDefault to only showing open issues
Tom Hughes [Sun, 10 Jun 2018 18:11:25 +0000 (19:11 +0100)]
Default to only showing open issues

6 years agoImprove system tests for issues
Tom Hughes [Sun, 10 Jun 2018 18:03:33 +0000 (19:03 +0100)]
Improve system tests for issues

6 years agoImprove model tests for issues
Tom Hughes [Sun, 10 Jun 2018 16:59:15 +0000 (17:59 +0100)]
Improve model tests for issues

6 years agoImprove controller tests for issues
Tom Hughes [Sun, 10 Jun 2018 16:48:47 +0000 (17:48 +0100)]
Improve controller tests for issues

6 years agoMake report type a required field
Tom Hughes [Sun, 10 Jun 2018 16:16:33 +0000 (17:16 +0100)]
Make report type a required field