]> git.openstreetmap.org Git - rails.git/log
rails.git
5 years agoDon't try and commas to the trace size
Tom Hughes [Sun, 13 Oct 2019 09:53:08 +0000 (10:53 +0100)]
Don't try and commas to the trace size

It breaks pluralisation lookups in the locale and in any case
adding a comma every three digits is locale specific.

Fixes #2388

5 years agoAdded landuse icons and fixed some mistakes in browse.scss
hikemaniac [Wed, 9 Oct 2019 15:53:37 +0000 (17:53 +0200)]
Added landuse icons and fixed some mistakes in browse.scss

Closes #2385

5 years agoSwitch to use v4.0 of the Facebook API for authentication
Tom Hughes [Tue, 8 Oct 2019 17:36:27 +0000 (18:36 +0100)]
Switch to use v4.0 of the Facebook API for authentication

5 years agoUpdate rubocop todo
Tom Hughes [Mon, 7 Oct 2019 19:38:03 +0000 (20:38 +0100)]
Update rubocop todo

5 years agoUpdate bundle
Tom Hughes [Mon, 7 Oct 2019 19:29:35 +0000 (20:29 +0100)]
Update bundle

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Oct 2019 17:56:25 +0000 (19:56 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Oct 2019 17:47:17 +0000 (19:47 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 1 Oct 2019 14:41:10 +0000 (16:41 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Sep 2019 18:38:09 +0000 (20:38 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Sep 2019 16:02:20 +0000 (18:02 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Sep 2019 12:41:09 +0000 (14:41 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Sep 2019 17:04:07 +0000 (19:04 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Sep 2019 14:10:59 +0000 (16:10 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Sep 2019 17:26:49 +0000 (19:26 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 6 Sep 2019 05:09:19 +0000 (07:09 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoWhen overriding setup make sure to call the superclass
Tom Hughes [Thu, 5 Sep 2019 19:30:34 +0000 (20:30 +0100)]
When overriding setup make sure to call the superclass

5 years agoMerge pull request #1779 from stefanb/tag-colour-preview
Andy Allan [Wed, 4 Sep 2019 13:15:06 +0000 (15:15 +0200)]
Merge pull request #1779 from stefanb/tag-colour-preview

Added color preview box in tag browser sidebar

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 3 Sep 2019 07:38:41 +0000 (09:38 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoAdd banner for SotM 2019
Michael Reichert [Sun, 1 Sep 2019 15:20:52 +0000 (17:20 +0200)]
Add banner for SotM 2019

5 years agofixed line lengths
Stefan Baebler [Sat, 31 Aug 2019 11:15:33 +0000 (13:15 +0200)]
fixed line lengths

5 years agofixed some rubocop violations
Stefan Baebler [Sat, 31 Aug 2019 10:10:36 +0000 (12:10 +0200)]
fixed some rubocop violations

5 years agoFixed 2 new eslint errors
Stefan Baebler [Sat, 31 Aug 2019 09:59:44 +0000 (11:59 +0200)]
Fixed 2 new eslint errors

5 years agoColour preview moved into new browse_tags_helper
Stefan Baebler [Sat, 31 Aug 2019 09:40:42 +0000 (11:40 +0200)]
Colour preview moved into new browse_tags_helper

In 74d2c4336bab2efe44c6bdadf688d26b18e320b3 browse_helper was split int two

5 years agoMerge branch 'master' into tag-colour-preview-rebase
Stefan Baebler [Sat, 31 Aug 2019 09:34:57 +0000 (11:34 +0200)]
Merge branch 'master' into tag-colour-preview-rebase

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Aug 2019 18:29:03 +0000 (20:29 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2362'
Tom Hughes [Wed, 28 Aug 2019 16:49:35 +0000 (17:49 +0100)]
Merge remote-tracking branch 'upstream/pull/2362'

5 years agoMerge remote-tracking branch 'upstream/pull/1926'
Tom Hughes [Wed, 28 Aug 2019 16:23:10 +0000 (17:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1926'

5 years agoMake the logo on the error page clickable
Andy Allan [Wed, 28 Aug 2019 14:02:34 +0000 (16:02 +0200)]
Make the logo on the error page clickable

Also use the same picture/srcset code as on the main header

5 years agoMerge pull request #2266 from systemed/patch-2
Andy Allan [Wed, 28 Aug 2019 13:20:21 +0000 (15:20 +0200)]
Merge pull request #2266 from systemed/patch-2

Add user_<uid> class to diary entry div

5 years agoExclude all vendored code from rubocop checking
Tom Hughes [Tue, 27 Aug 2019 14:33:23 +0000 (15:33 +0100)]
Exclude all vendored code from rubocop checking

5 years agoDrop ancient imported daemon generator
Tom Hughes [Tue, 27 Aug 2019 14:23:30 +0000 (15:23 +0100)]
Drop ancient imported daemon generator

5 years agoUpdate bundle
Tom Hughes [Tue, 27 Aug 2019 14:21:15 +0000 (15:21 +0100)]
Update bundle

5 years agoUpdate yarn bundle
Tom Hughes [Tue, 27 Aug 2019 14:09:31 +0000 (15:09 +0100)]
Update yarn bundle

5 years agoMerge remote-tracking branch 'upstream/pull/2359'
Tom Hughes [Tue, 27 Aug 2019 13:59:53 +0000 (14:59 +0100)]
Merge remote-tracking branch 'upstream/pull/2359'

5 years agoUpdate to iD v2.15.5
Bryan Housel [Mon, 26 Aug 2019 18:16:28 +0000 (14:16 -0400)]
Update to iD v2.15.5

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Aug 2019 10:29:57 +0000 (12:29 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 23 Aug 2019 04:49:42 +0000 (06:49 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoFix numericality validation to use correct integer only constraint
Tom Hughes [Thu, 22 Aug 2019 09:36:03 +0000 (10:36 +0100)]
Fix numericality validation to use correct integer only constraint

Fixes #2355

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Aug 2019 09:38:09 +0000 (11:38 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Aug 2019 16:29:24 +0000 (18:29 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoIncrease poltergeist timeout
Tom Hughes [Wed, 14 Aug 2019 18:48:21 +0000 (19:48 +0100)]
Increase poltergeist timeout

5 years agoUpdate rubocop todo
Tom Hughes [Wed, 14 Aug 2019 18:27:12 +0000 (19:27 +0100)]
Update rubocop todo

5 years agoFix rubocop warnings
Tom Hughes [Wed, 14 Aug 2019 18:27:02 +0000 (19:27 +0100)]
Fix rubocop warnings

5 years agoUpdate bundle
Tom Hughes [Wed, 14 Aug 2019 18:21:43 +0000 (19:21 +0100)]
Update bundle

5 years agoExplicitly require gpx in the trace model tests
Tom Hughes [Wed, 14 Aug 2019 18:10:15 +0000 (19:10 +0100)]
Explicitly require gpx in the trace model tests

If we don't do this and no other test manages to trigger an
autoload before we run then we might try and autoload it inside
a MockFS block which will fail.

5 years agoRevert "Always look to the global scope for the GPX module"
Tom Hughes [Wed, 14 Aug 2019 18:06:09 +0000 (19:06 +0100)]
Revert "Always look to the global scope for the GPX module"

This reverts commit fbefe3550cec6d609ef1dc97ea4c48f73447cee4.

5 years agoInclude any current search terms in the page title
Sam Jenkins [Sat, 10 Aug 2019 22:52:13 +0000 (23:52 +0100)]
Include any current search terms in the page title

Fixes #2336
Closes #2347

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Aug 2019 10:28:03 +0000 (12:28 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Aug 2019 18:26:06 +0000 (20:26 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoCreate config/settings.local.yml in Vagrant provisioning script
Tom Hughes [Thu, 8 Aug 2019 08:50:13 +0000 (09:50 +0100)]
Create config/settings.local.yml in Vagrant provisioning script

5 years agoMake sure phantomjs is installed
Tom Hughes [Wed, 7 Aug 2019 16:29:26 +0000 (17:29 +0100)]
Make sure phantomjs is installed

5 years agoFix vagrant provisioning script
Tom Hughes [Wed, 7 Aug 2019 16:25:48 +0000 (17:25 +0100)]
Fix vagrant provisioning script

Fixes #2343

5 years agoExclude phantomjs from generic webkit as it's ancient
Tom Hughes [Mon, 5 Aug 2019 19:41:22 +0000 (20:41 +0100)]
Exclude phantomjs from generic webkit as it's ancient

Fixes #2339

5 years agoPatch broken polyfill feature test
Tom Hughes [Mon, 5 Aug 2019 19:39:24 +0000 (20:39 +0100)]
Patch broken polyfill feature test

https://github.com/Financial-Times/polyfill-service/issues/2006

5 years agoUpdate polyfills
Tom Hughes [Mon, 5 Aug 2019 19:29:56 +0000 (20:29 +0100)]
Update polyfills

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Aug 2019 10:19:36 +0000 (12:19 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Aug 2019 16:40:11 +0000 (18:40 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoAvoid trying to resize non-resizable images
Tom Hughes [Wed, 31 Jul 2019 10:42:09 +0000 (11:42 +0100)]
Avoid trying to resize non-resizable images

Fixed #2329

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Jul 2019 12:41:46 +0000 (14:41 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2330'
Tom Hughes [Fri, 26 Jul 2019 17:01:50 +0000 (18:01 +0100)]
Merge remote-tracking branch 'upstream/pull/2330'

5 years agoRemove file unrelated to iD 2.15.4 release
Quincy Morgan [Fri, 26 Jul 2019 16:52:16 +0000 (12:52 -0400)]
Remove file unrelated to iD 2.15.4 release

5 years agoUpdate to iD v2.15.4
Quincy Morgan [Fri, 26 Jul 2019 16:43:22 +0000 (12:43 -0400)]
Update to iD v2.15.4

5 years agoPass viewbox to Nominatim when geocoding routing endpoints
marc tobias [Thu, 25 Jul 2019 01:25:02 +0000 (03:25 +0200)]
Pass viewbox to Nominatim when geocoding routing endpoints

Fixes #2327
Closes #2328

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Jul 2019 08:28:33 +0000 (10:28 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoFix text direction for Japanese
Tom Hughes [Tue, 23 Jul 2019 18:27:34 +0000 (19:27 +0100)]
Fix text direction for Japanese

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jul 2019 12:13:38 +0000 (14:13 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoFix new rubocop warnings
Tom Hughes [Thu, 18 Jul 2019 15:43:11 +0000 (16:43 +0100)]
Fix new rubocop warnings

5 years agoUpdate bundle
Tom Hughes [Thu, 18 Jul 2019 15:39:56 +0000 (16:39 +0100)]
Update bundle

Closes #2325

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Jul 2019 14:39:55 +0000 (16:39 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoDrop paperclip
Tom Hughes [Tue, 16 Jul 2019 17:55:15 +0000 (18:55 +0100)]
Drop paperclip

5 years agoDrop old user image columns
Tom Hughes [Tue, 16 Jul 2019 17:53:33 +0000 (18:53 +0100)]
Drop old user image columns

5 years agoReplace migrations that rely on models with rake tasks
Tom Hughes [Wed, 17 Jul 2019 17:55:15 +0000 (18:55 +0100)]
Replace migrations that rely on models with rake tasks

Replace some migrations that rely on relationships between
models to add subscriptions with rake tasks.

5 years agoDon't try and add fingerprints for user images
Tom Hughes [Wed, 17 Jul 2019 17:49:09 +0000 (18:49 +0100)]
Don't try and add fingerprints for user images

It won't actually work, and anybody migrating up to the current
schema is never going to use the fingerprints anyway.

5 years agoMerge remote-tracking branch 'upstream/pull/2320'
Tom Hughes [Wed, 17 Jul 2019 17:47:05 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2320'

5 years agoMerge remote-tracking branch 'upstream/pull/2322'
Tom Hughes [Wed, 17 Jul 2019 17:47:02 +0000 (18:47 +0100)]
Merge remote-tracking branch 'upstream/pull/2322'

5 years agoRework help page text
Andy Allan [Wed, 17 Jul 2019 17:37:59 +0000 (19:37 +0200)]
Rework help page text

This avoids using the OSM acronym, and uses better titles than urls
for the help forum and the wiki. Both titles are based on the title
of the linked sites.

5 years agoSet server_url to test.host in test environments
Tom Hughes [Wed, 17 Jul 2019 10:20:31 +0000 (11:20 +0100)]
Set server_url to test.host in test environments

Fixes #2319

5 years agoAvoid more models in old migrations
Andy Allan [Wed, 17 Jul 2019 10:16:20 +0000 (12:16 +0200)]
Avoid more models in old migrations

Although these migrations run fine today, they could break in the future
if changes are made to the current model code.

5 years agoAvoid using live models in old migrations
Andy Allan [Wed, 17 Jul 2019 09:52:02 +0000 (11:52 +0200)]
Avoid using live models in old migrations

Instead, we define models in the migrations themselves. This ensures that
column names etc match the state of the database during the migration,
not the current live version of the model.

5 years agoUpdate annotations after 91a37235ac748df7dc241b215790d6cbecd652f3
Andy Allan [Wed, 17 Jul 2019 08:39:10 +0000 (10:39 +0200)]
Update annotations after 91a37235ac748df7dc241b215790d6cbecd652f3

5 years agoUse the configured host name for user image URLs
Tom Hughes [Tue, 16 Jul 2019 21:41:37 +0000 (22:41 +0100)]
Use the configured host name for user image URLs

5 years agoRemove support for old style user images
Tom Hughes [Tue, 16 Jul 2019 17:45:41 +0000 (18:45 +0100)]
Remove support for old style user images

5 years agoUpdate gravatar methods to check for Active Storage images
Tom Hughes [Tue, 16 Jul 2019 17:34:50 +0000 (18:34 +0100)]
Update gravatar methods to check for Active Storage images

5 years agoReturn absolute URLs for user images
Tom Hughes [Tue, 16 Jul 2019 21:28:36 +0000 (22:28 +0100)]
Return absolute URLs for user images

5 years agoMerge remote-tracking branch 'upstream/pull/2313'
Tom Hughes [Tue, 16 Jul 2019 10:56:13 +0000 (11:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2313'

5 years agoDefer deletion of avatars to a background job
Tom Hughes [Tue, 16 Jul 2019 07:27:14 +0000 (08:27 +0100)]
Defer deletion of avatars to a background job

5 years agoIncrease expiry for Active Storage URLs
Tom Hughes [Tue, 16 Jul 2019 07:25:17 +0000 (08:25 +0100)]
Increase expiry for Active Storage URLs

5 years agoAllow BMP images to be transformed
Tom Hughes [Mon, 15 Jul 2019 23:24:37 +0000 (00:24 +0100)]
Allow BMP images to be transformed

https://github.com/rails/rails/issues/35953
https://github.com/rails/rails/pull/36051

5 years agoRun any Active Storage jobs in the storage queue
Tom Hughes [Mon, 15 Jul 2019 21:12:29 +0000 (22:12 +0100)]
Run any Active Storage jobs in the storage queue

5 years agoSend trace import result notification immediately
Tom Hughes [Mon, 15 Jul 2019 20:45:07 +0000 (21:45 +0100)]
Send trace import result notification immediately

If we delay sending failure notifications then they will fail
because the trace will no longer exist.

As trace imports are running in the background anyway there
doesn't seem to be any good reason to defer the emails.

Fixes #2312

5 years agoFix rubocop warning
Tom Hughes [Mon, 15 Jul 2019 20:18:13 +0000 (21:18 +0100)]
Fix rubocop warning

5 years agoStop creating a shared global querystring variable
Tom Hughes [Mon, 15 Jul 2019 19:27:42 +0000 (20:27 +0100)]
Stop creating a shared global querystring variable

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jul 2019 18:39:25 +0000 (20:39 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoSkip uploading images for users that have a new style avatar
Tom Hughes [Mon, 15 Jul 2019 18:17:01 +0000 (19:17 +0100)]
Skip uploading images for users that have a new style avatar

5 years agoAdd a rake task to move user avatars to Active Storage
Tom Hughes [Mon, 15 Jul 2019 16:29:39 +0000 (17:29 +0100)]
Add a rake task to move user avatars to Active Storage

5 years agoUpdate querystring references
Tom Hughes [Mon, 15 Jul 2019 09:03:09 +0000 (10:03 +0100)]
Update querystring references

5 years agoRevert accidental schema changes
Tom Hughes [Mon, 15 Jul 2019 08:27:52 +0000 (09:27 +0100)]
Revert accidental schema changes

5 years agoIt's to_sym not to_symbol
Tom Hughes [Mon, 15 Jul 2019 07:39:20 +0000 (08:39 +0100)]
It's to_sym not to_symbol

5 years agoMerge remote-tracking branch 'upstream/pull/2296'
Tom Hughes [Mon, 15 Jul 2019 07:19:30 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2296'

5 years agoEnable a few more eslint checks
Tom Hughes [Sun, 14 Jul 2019 11:08:02 +0000 (12:08 +0100)]
Enable a few more eslint checks