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

6 years agoMake reportable item titles translatable
Tom Hughes [Sun, 10 Jun 2018 16:05:21 +0000 (17:05 +0100)]
Make reportable item titles translatable

6 years agoMerge branch 'master' into next
Tom Hughes [Sun, 10 Jun 2018 16:02:12 +0000 (17:02 +0100)]
Merge branch 'master' into next

6 years agoUse lazy lookups for translations in issues
Tom Hughes [Sun, 10 Jun 2018 15:03:38 +0000 (16:03 +0100)]
Use lazy lookups for translations in issues

6 years agoAvoid losing filter settings when an invalid user is entered
Tom Hughes [Sun, 10 Jun 2018 14:42:35 +0000 (15:42 +0100)]
Avoid losing filter settings when an invalid user is entered

6 years agoUse select_tag for issue filter fields instead of abusing select
Tom Hughes [Sun, 10 Jun 2018 14:32:27 +0000 (15:32 +0100)]
Use select_tag for issue filter fields instead of abusing select

6 years agoAdd some extra indexes on issues
Tom Hughes [Sun, 10 Jun 2018 14:13:23 +0000 (15:13 +0100)]
Add some extra indexes on issues

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Jun 2018 09:23:59 +0000 (11:23 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Jun 2018 06:19:03 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoMerge remote-tracking branch 'upstream/pull/1892'
Tom Hughes [Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)]
Merge remote-tracking branch 'upstream/pull/1892'

6 years agoUpdate style for change of name for message controller
Tom Hughes [Wed, 6 Jun 2018 13:45:19 +0000 (14:45 +0100)]
Update style for change of name for message controller

6 years agoMerge remote-tracking branch 'upstream/pull/1893'
Tom Hughes [Wed, 6 Jun 2018 13:33:36 +0000 (14:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1893'

6 years agoMerge remote-tracking branch 'upstream/pull/1894'
Tom Hughes [Wed, 6 Jun 2018 13:30:27 +0000 (14:30 +0100)]
Merge remote-tracking branch 'upstream/pull/1894'

6 years agoMerge remote-tracking branch 'upstream/pull/1895'
Tom Hughes [Wed, 6 Jun 2018 13:28:30 +0000 (14:28 +0100)]
Merge remote-tracking branch 'upstream/pull/1895'

6 years agoAllow iD to access ESRI imagery metadata
Tom Hughes [Wed, 6 Jun 2018 13:25:52 +0000 (14:25 +0100)]
Allow iD to access ESRI imagery metadata

6 years agoUpdate Potlatch 2 to 2.5-37-ga38498b2 build
Tom Hughes [Wed, 6 Jun 2018 13:17:49 +0000 (14:17 +0100)]
Update Potlatch 2 to 2.5-37-ga38498b2 build

6 years agoSpeed up tests by making fewer random changes
Andy Allan [Wed, 6 Jun 2018 05:54:09 +0000 (13:54 +0800)]
Speed up tests by making fewer random changes

The old_node_controller#test_version in particular was slow, since
it saves a huge number of tags when adding a tag 30 times over. Since
the tests are random and not based on the number of iterations, this
reduces the iteration counts.

6 years agoPrefer the helper in controllers
Andy Allan [Wed, 6 Jun 2018 05:34:34 +0000 (13:34 +0800)]
Prefer the  helper in controllers

This avoids future gotchas with conversion to lazy lookups.

6 years agoFix lazy i18n lookups for browse error pages
Andy Allan [Wed, 6 Jun 2018 05:24:01 +0000 (13:24 +0800)]
Fix lazy i18n lookups for browse error pages

`I18n.t` doesn't support lazy lookups, whereas the equivalent
rails `t` helper does. The code can also be simplified to avoid the
lookup table.

Fixes 1877

6 years agoFix missing message translation strings
Andy Allan [Wed, 6 Jun 2018 03:53:05 +0000 (11:53 +0800)]
Fix missing message translation strings

6 years agoRefactor messages show action to be resourceful
Andy Allan [Wed, 6 Jun 2018 03:51:52 +0000 (11:51 +0800)]
Refactor messages show action to be resourceful

6 years agoRefactor inbox and outbox paths to avoid display names in urls.
Andy Allan [Wed, 6 Jun 2018 03:27:27 +0000 (11:27 +0800)]
Refactor inbox and outbox paths to avoid display names in urls.

6 years agoRefactor trace creation pages
Andy Allan [Wed, 6 Jun 2018 02:22:42 +0000 (10:22 +0800)]
Refactor trace creation pages

Split the trace creation into new and create methods, with standard resourceful routing. Provide a redirect for external requests to the old url.

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

6 years agoRevert to using ubuntu/xenial64 with virtualbox
Tom Hughes [Fri, 1 Jun 2018 17:26:21 +0000 (18:26 +0100)]
Revert to using ubuntu/xenial64  with virtualbox

The generic/ubuntu1604 box doesn't support the vbox extensions.

6 years agoOnly set QT_QPA_PLATFORM if phantomjs fails without it
Tom Hughes [Thu, 31 May 2018 23:41:29 +0000 (00:41 +0100)]
Only set QT_QPA_PLATFORM if phantomjs fails without it

6 years agoUpdate vagrant configuration
Tom Hughes [Thu, 31 May 2018 21:47:49 +0000 (22:47 +0100)]
Update vagrant configuration

Use a common box for all platforms and fix up various
issues with the provisioning script.

6 years agoSet QT_QPA_PLATFORM to offscreen in the test environment
Tom Hughes [Thu, 31 May 2018 21:46:45 +0000 (22:46 +0100)]
Set QT_QPA_PLATFORM to offscreen in the test environment

Works around an issue with the weird way the debian/ubuntu
version of phantomjs is built:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
https://github.com/ariya/phantomjs/issues/14376

6 years agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 31 May 2018 06:32:14 +0000 (08:32 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoAvoid using inline javascript to update message list
Tom Hughes [Wed, 30 May 2018 14:30:23 +0000 (15:30 +0100)]
Avoid using inline javascript to update message list

6 years agoConcept URIs for Wikidata entities
David Abián [Mon, 28 May 2018 10:29:29 +0000 (12:29 +0200)]
Concept URIs for Wikidata entities

Wikidata entities should be linked using concept URIs, which are
permanent. This is the right way of linking web resources according
to the Linked Data principles.

Closes #1884

6 years agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 28 May 2018 09:02:50 +0000 (11:02 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate for final linear-gradient syntax
Tom Hughes [Sun, 27 May 2018 19:48:30 +0000 (20:48 +0100)]
Update for final linear-gradient syntax

6 years agoRemove include of Mixin.Events
Tom Hughes [Sun, 27 May 2018 19:33:54 +0000 (20:33 +0100)]
Remove include of Mixin.Events

The Events mixin has been replaced by inherting from Evented and
the Layer class already inherits from that.

6 years agoUpdate bundle
Tom Hughes [Sun, 27 May 2018 14:51:47 +0000 (15:51 +0100)]
Update bundle

6 years agoChange language immediately after updating settings
J Guthrie [Sun, 27 May 2018 14:12:34 +0000 (15:12 +0100)]
Change language immediately after updating settings

Closes #1883

6 years agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 25 May 2018 09:57:39 +0000 (11:57 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoImprove HOT layer attribution
Benoît [Fri, 25 May 2018 08:39:19 +0000 (10:39 +0200)]
Improve HOT layer attribution

The style is by HOT and the server is provided by OpenStreetMap France.

Closes #1882

6 years agoMerge remote-tracking branch 'upstream/pull/1880'
Tom Hughes [Thu, 24 May 2018 18:06:31 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/1880'

6 years agoWrap the permission label with a <label> tag
Edward Betts [Thu, 24 May 2018 11:49:12 +0000 (12:49 +0100)]
Wrap the permission label with a <label> tag

Gives the user a larger target to toggle a permission.

6 years agoupdate New Zealand copyright based on current attribution instructions from LINZ
Andrew Harvey [Thu, 24 May 2018 09:45:05 +0000 (19:45 +1000)]
update New Zealand copyright based on current attribution instructions from LINZ

6 years agoMerge pull request #1871 from hikemaniac/browse-icon-typo
Andy Allan [Thu, 24 May 2018 03:39:22 +0000 (11:39 +0800)]
Merge pull request #1871 from hikemaniac/browse-icon-typo

Fix a browse icon typo

6 years agoDon't override non-existent policy
Tom Hughes [Wed, 23 May 2018 11:50:10 +0000 (12:50 +0100)]
Don't override non-existent policy

6 years agoUse an empty array for ruby 2.3 compatibility
Tom Hughes [Wed, 23 May 2018 11:21:24 +0000 (12:21 +0100)]
Use an empty array for ruby 2.3 compatibility

Apparently `false.dup` throws in ruby 2.3 and not in 2.5...

6 years agoCompletely remove form-action restrictions for OAuth callbacks
Tom Hughes [Wed, 23 May 2018 11:09:21 +0000 (12:09 +0100)]
Completely remove form-action restrictions for OAuth callbacks

The CSP3 draft only allows a * rule match network schemes and
mobile devices often use callbacks to custom URL schemes.

6 years agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

6 years agoAllow CSP to be put in enforcing mode
Tom Hughes [Tue, 22 May 2018 07:41:13 +0000 (08:41 +0100)]
Allow CSP to be put in enforcing mode

6 years agoUpdate swfobject to use uncompressed source
Tom Hughes [Tue, 22 May 2018 07:40:41 +0000 (08:40 +0100)]
Update swfobject to use uncompressed source

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 May 2018 14:16:17 +0000 (16:16 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoAdd missing dependencies
Tom Hughes [Sat, 19 May 2018 10:15:56 +0000 (11:15 +0100)]
Add missing dependencies

6 years agoAllow inline styles in iD
Tom Hughes [Fri, 18 May 2018 19:28:09 +0000 (20:28 +0100)]
Allow inline styles in iD

6 years agoRebase to current master
hikemaniac [Fri, 18 May 2018 11:59:59 +0000 (13:59 +0200)]
Rebase to current master

Merge openstreetmap/openstreetmap-website into hikemaniac/openstreetmap-website

6 years agoUse XHR instead of jsonp for GraphHopper
Peter Karich [Thu, 17 May 2018 19:47:58 +0000 (20:47 +0100)]
Use XHR instead of jsonp for GraphHopper

Closes #1872

6 years agoUpdate for rubocop 0.54.0
Tom Hughes [Thu, 17 May 2018 18:39:25 +0000 (19:39 +0100)]
Update for rubocop 0.54.0