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

6 years agoUpdate bundle
Tom Hughes [Thu, 17 May 2018 18:25:58 +0000 (19:25 +0100)]
Update bundle

6 years agoConfigure manifest-src and worker-src in security policy
Tom Hughes [Thu, 17 May 2018 18:10:39 +0000 (19:10 +0100)]
Configure manifest-src and worker-src in security policy

6 years agoPreserve schemes in security policy
Tom Hughes [Thu, 17 May 2018 18:10:23 +0000 (19:10 +0100)]
Preserve schemes in security policy

6 years agoQuote translations to stop them looking like numbers
Tom Hughes [Thu, 17 May 2018 17:37:52 +0000 (18:37 +0100)]
Quote translations to stop them looking like numbers

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 agoConvert note view to use server side conditions
Tom Hughes [Thu, 17 May 2018 10:29:28 +0000 (11:29 +0100)]
Convert note view to use server side conditions

Fixes #1869

6 years agoAdd piwik to allowed URIs in connect-src
Tom Hughes [Thu, 17 May 2018 10:29:06 +0000 (11:29 +0100)]
Add piwik to allowed URIs in connect-src

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

6 years agoRemove unsafe-inline form default style policy
Tom Hughes [Wed, 16 May 2018 19:40:55 +0000 (20:40 +0100)]
Remove unsafe-inline form default style policy

6 years agoRemove some inline styles
Tom Hughes [Wed, 16 May 2018 19:27:35 +0000 (20:27 +0100)]
Remove some inline styles

6 years agoMerge remote-tracking branch 'upstream/pull/1866'
Tom Hughes [Wed, 16 May 2018 17:57:34 +0000 (18:57 +0100)]
Merge remote-tracking branch 'upstream/pull/1866'

6 years agoAllow iD to access wikidata
Tom Hughes [Wed, 16 May 2018 10:36:46 +0000 (11:36 +0100)]
Allow iD to access wikidata

6 years agoRevert "Remove unused POST method for message replies"
Tom Hughes [Wed, 16 May 2018 09:43:26 +0000 (10:43 +0100)]
Revert "Remove unused POST method for message replies"

This reverts commit 40cab845fbabb3f0aa8131c16e48cd3d58b6dcb3.

6 years agoAllow iD to access wikipedia
Tom Hughes [Wed, 16 May 2018 07:48:38 +0000 (08:48 +0100)]
Allow iD to access wikipedia

6 years agoRemove if_user and similar methods
Andy Allan [Wed, 16 May 2018 05:05:20 +0000 (13:05 +0800)]
Remove if_user and similar methods

Rather than hiding features based on CSS, just avoid including them
in the output. Fixes #1862

6 years agoFix test which was accidentally testing as the entry user twice
Andy Allan [Wed, 16 May 2018 04:59:16 +0000 (12:59 +0800)]
Fix test which was accidentally testing as the entry user twice

6 years agoFix a browse icon typo.
hikemaniac [Tue, 15 May 2018 18:05:40 +0000 (20:05 +0200)]
Fix a browse icon typo.

6 years agoMerge remote-tracking branch 'upstream/pull/1863'
Tom Hughes [Tue, 15 May 2018 17:36:55 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1863'

6 years agoTell jshint about bowser
Tom Hughes [Tue, 15 May 2018 13:42:05 +0000 (14:42 +0100)]
Tell jshint about bowser

6 years agoUse https to launch the remote editor except for modern browsers
Tom Hughes [Tue, 15 May 2018 13:08:57 +0000 (14:08 +0100)]
Use https to launch the remote editor except for modern browsers

Currently only Chrome 53+ and Firefox 55+ are known to support loading
of http resources from localhost for an https page.

6 years agoDefault frame-src to self
Tom Hughes [Tue, 15 May 2018 13:08:44 +0000 (14:08 +0100)]
Default frame-src to self

6 years agoAdd frame-src to allow http://127.0.0.1:8111
Tom Hughes [Tue, 15 May 2018 11:43:37 +0000 (12:43 +0100)]
Add frame-src to allow http://127.0.0.1:8111

6 years agoEnsure database is writable before destroying a message
Andy Allan [Tue, 15 May 2018 10:28:33 +0000 (18:28 +0800)]
Ensure database is writable before destroying a message

6 years agoRename messages#read to #show
Andy Allan [Tue, 15 May 2018 10:25:54 +0000 (18:25 +0800)]
Rename messages#read to #show

Also rename the named path, to align with resourceful routing

6 years agoRename messages#delete to destroy
Andy Allan [Tue, 15 May 2018 10:03:15 +0000 (18:03 +0800)]
Rename messages#delete to destroy

This is a better fit for rails controller method conventions, paving
the way to resourceful routing. Keep user-facing strings as 'delete'
since that's more commonly used.

6 years agoRemove unused POST method for message replies
Andy Allan [Tue, 15 May 2018 09:33:40 +0000 (17:33 +0800)]
Remove unused POST method for message replies

This action just shows the pre-filled form, with the target for
the form being the same as for new messages.

6 years agoUpgrade community index to 0.4.3 to fix issue with tirana polygon
Bryan Housel [Tue, 15 May 2018 00:35:29 +0000 (20:35 -0400)]
Upgrade community index to 0.4.3 to fix issue with tirana polygon

6 years agoUpdate to iD v2.8.2
Bryan Housel [Mon, 14 May 2018 21:55:32 +0000 (17:55 -0400)]
Update to iD v2.8.2

6 years agoMerge remote-tracking branch 'upstream/pull/1858'
Tom Hughes [Mon, 14 May 2018 19:14:56 +0000 (20:14 +0100)]
Merge remote-tracking branch 'upstream/pull/1858'

6 years agoMerge remote-tracking branch 'upstream/pull/1857'
Tom Hughes [Mon, 14 May 2018 19:13:41 +0000 (20:13 +0100)]
Merge remote-tracking branch 'upstream/pull/1857'

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, 14 May 2018 06:24:58 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoMake CSP rule for the remote control explicitly allow http
Tom Hughes [Sun, 13 May 2018 15:01:39 +0000 (16:01 +0100)]
Make CSP rule for the remote control explicitly allow http

6 years agoMerge remote-tracking branch 'upstream/pull/1851'
Tom Hughes [Sun, 13 May 2018 14:24:44 +0000 (15:24 +0100)]
Merge remote-tracking branch 'upstream/pull/1851'

6 years agoMerge remote-tracking branch 'upstream/pull/1850'
Tom Hughes [Sun, 13 May 2018 14:23:54 +0000 (15:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1850'

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, 10 May 2018 08:28:45 +0000 (10:28 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoRename message_controller to messages_controller
Andy Allan [Wed, 9 May 2018 08:38:37 +0000 (16:38 +0800)]
Rename message_controller to messages_controller

6 years agoLazy lookups for translations in message_controller.rb
Andy Allan [Wed, 9 May 2018 08:25:42 +0000 (16:25 +0800)]
Lazy lookups for translations in message_controller.rb

6 years agoRename trace_controller to traces_controller
Andy Allan [Wed, 9 May 2018 04:38:09 +0000 (12:38 +0800)]
Rename trace_controller to traces_controller

6 years agoMore lazy translation lookups for traces
Andy Allan [Wed, 9 May 2018 04:08:39 +0000 (12:08 +0800)]
More lazy translation lookups for traces

6 years agoUse named paths for messages
Andy Allan [Wed, 9 May 2018 03:24:11 +0000 (11:24 +0800)]
Use named paths for messages

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, 7 May 2018 06:07:53 +0000 (08:07 +0200)]
Localisation updates from https://translatewiki.net.

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

6 years agoFix translation lookups for roundabout exits
Tom Hughes [Mon, 30 Apr 2018 22:01:08 +0000 (23:01 +0100)]
Fix translation lookups for roundabout exits

6 years agoAvoid using "one" and "two" as translation keys
Tom Hughes [Mon, 30 Apr 2018 21:38:43 +0000 (22:38 +0100)]
Avoid using "one" and "two" as translation keys

6 years agoMerge remote-tracking branch 'upstream/pull/1802'
Tom Hughes [Mon, 30 Apr 2018 17:56:09 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/1802'

6 years agoAdd terminating semicolon to overpass query
Tom Hughes [Mon, 30 Apr 2018 17:53:52 +0000 (18:53 +0100)]
Add terminating semicolon to overpass query

Fixes #1843

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

6 years agoSeparated ordinal roundabout exit text from normal exit text
J Guthrie [Sun, 29 Apr 2018 20:59:54 +0000 (21:59 +0100)]
Separated ordinal roundabout exit text from normal exit text

6 years agoMerge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...
J Guthrie [Sun, 29 Apr 2018 20:44:26 +0000 (21:44 +0100)]
Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetmap-website into convert_roundabout_exits

6 years agoChange roundabout exit logic and remove blank string from locale file
J Guthrie [Sun, 29 Apr 2018 19:30:44 +0000 (20:30 +0100)]
Change roundabout exit logic and remove blank string from locale file

6 years agoMerge branch 'master' into convert_roundabout_exits
Jamie Guthrie [Sun, 29 Apr 2018 18:53:57 +0000 (19:53 +0100)]
Merge branch 'master' into convert_roundabout_exits

6 years agoMerge remote-tracking branch 'upstream/pull/1809'
Tom Hughes [Sun, 29 Apr 2018 18:37:50 +0000 (19:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1809'

6 years agoUpdate translation keys for renaming of note to notes
Tom Hughes [Sun, 29 Apr 2018 00:09:38 +0000 (01:09 +0100)]
Update translation keys for renaming of note to notes

6 years agoFix syntax error with ruby 2.5
Tom Hughes [Sat, 28 Apr 2018 16:12:27 +0000 (17:12 +0100)]
Fix syntax error with ruby 2.5

6 years agoUpdate xid_to_int4 to use postgres version 1 calling convention
Tom Hughes [Sat, 28 Apr 2018 14:15:53 +0000 (15:15 +0100)]
Update xid_to_int4 to use postgres version 1 calling convention

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

6 years agoRemoved directions from roundabout exit instructions
J Guthrie [Wed, 25 Apr 2018 23:51:35 +0000 (00:51 +0100)]
Removed directions from roundabout exit instructions

6 years agoAdded exit counts as seperate keys in locale file
J Guthrie [Wed, 25 Apr 2018 23:35:41 +0000 (00:35 +0100)]
Added exit counts as seperate keys in locale file

6 years agoUse rails helpers to construct URLs
Rajdeep Mandrekar [Wed, 25 Apr 2018 19:38:41 +0000 (01:08 +0530)]
Use rails helpers to construct URLs

Fixes #1817
Closes #1840

6 years agoMerge remote-tracking branch 'upstream/pull/1833'
Tom Hughes [Wed, 25 Apr 2018 16:44:53 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/1833'

6 years agoMerge remote-tracking branch 'upstream/pull/1839'
Tom Hughes [Wed, 25 Apr 2018 16:39:27 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/1839'

6 years agoMerge remote-tracking branch 'upstream/pull/1838'
Tom Hughes [Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1838'

6 years agoMerge remote-tracking branch 'upstream/pull/1837'
Tom Hughes [Wed, 25 Apr 2018 16:38:19 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1837'

6 years agoMerge remote-tracking branch 'upstream/pull/1836'
Tom Hughes [Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1836'