]> git.openstreetmap.org Git - rails.git/log
rails.git
6 years agoRevert to dalli 2.7.6
Tom Hughes [Mon, 26 Mar 2018 08:20:34 +0000 (09:20 +0100)]
Revert to dalli 2.7.6

6 years agoUpdate bundle
Tom Hughes [Mon, 26 Mar 2018 07:51:27 +0000 (08:51 +0100)]
Update bundle

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Mar 2018 06:19:11 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.

6 years agoMerge remote-tracking branch 'upstream/pull/1788'
Tom Hughes [Sun, 25 Mar 2018 13:27:16 +0000 (14:27 +0100)]
Merge remote-tracking branch 'upstream/pull/1788'

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Mar 2018 07:19:26 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUse user_path links. Fixes #1785
Andy Allan [Wed, 21 Mar 2018 03:05:46 +0000 (11:05 +0800)]
Use user_path links. Fixes #1785

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Mar 2018 20:07:35 +0000 (21:07 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Mar 2018 15:10:33 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Mar 2018 08:10:50 +0000 (09:10 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate to iD v2.7.1
Bryan Housel [Sun, 11 Mar 2018 15:58:48 +0000 (11:58 -0400)]
Update to iD v2.7.1

6 years agoMerge branch 'pull/1765'
Andy Allan [Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)]
Merge branch 'pull/1765'

6 years agoSimplify redirect.
Andy Allan [Fri, 9 Mar 2018 07:56:56 +0000 (15:56 +0800)]
Simplify redirect.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Mar 2018 08:43:51 +0000 (09:43 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoAdded support for 2 more secondary wikidata tag links
Štefan Baebler [Sun, 4 Mar 2018 23:01:19 +0000 (00:01 +0100)]
Added support for 2 more secondary wikidata tag links

Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata

6 years agoUpdate to iD v2.7.0
Bryan Housel [Fri, 2 Mar 2018 23:06:44 +0000 (18:06 -0500)]
Update to iD v2.7.0

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 5 Mar 2018 08:32:42 +0000 (09:32 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoValidate user location is sensible
Tom Hughes [Sun, 4 Mar 2018 10:53:14 +0000 (10:53 +0000)]
Validate user location is sensible

6 years agoUse home_tile to find nearby users
Tom Hughes [Sun, 4 Feb 2018 16:03:16 +0000 (16:03 +0000)]
Use home_tile to find nearby users

6 years agoMake OSM::GreatCircle#bounds return a BoundingBox object
Tom Hughes [Sun, 4 Feb 2018 15:54:13 +0000 (15:54 +0000)]
Make OSM::GreatCircle#bounds return a BoundingBox object

6 years agoAdd an indexed home_tile column to the user table
Tom Hughes [Sun, 4 Feb 2018 15:49:12 +0000 (15:49 +0000)]
Add an indexed home_tile column to the user table

6 years agoChange test case
biswesh456 [Sat, 3 Mar 2018 14:50:52 +0000 (20:20 +0530)]
Change test case

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Mar 2018 07:22:44 +0000 (08:22 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoMerge remote-tracking branch 'upstream/pull/1772'
Tom Hughes [Tue, 27 Feb 2018 20:37:53 +0000 (20:37 +0000)]
Merge remote-tracking branch 'upstream/pull/1772'

6 years agoMove abbr style from border to text-decoration
Holger Jeromin [Tue, 27 Feb 2018 20:25:03 +0000 (21:25 +0100)]
Move abbr style from border to text-decoration

6 years agoMerge remote-tracking branch 'upstream/pull/1769'
Tom Hughes [Tue, 27 Feb 2018 20:22:15 +0000 (20:22 +0000)]
Merge remote-tracking branch 'upstream/pull/1769'

6 years agoRemove underline from abbr elements
Tom Hughes [Tue, 27 Feb 2018 20:19:52 +0000 (20:19 +0000)]
Remove underline from abbr elements

Fixes #1771

6 years agoTrace everywhere in potlatch too
Aaron Lidman [Tue, 27 Feb 2018 06:42:29 +0000 (22:42 -0800)]
Trace everywhere in potlatch too

6 years agoUse trace consistently, closes #1644
Aaron Lidman [Tue, 27 Feb 2018 06:42:03 +0000 (22:42 -0800)]
Use trace consistently, closes #1644

6 years agoExclude hidden diary entries and comments from spam scoring
Tom Hughes [Mon, 26 Feb 2018 22:35:06 +0000 (22:35 +0000)]
Exclude hidden diary entries and comments from spam scoring

6 years agoUse bolded version of destinations
Tom Hughes [Sun, 25 Feb 2018 21:29:54 +0000 (21:29 +0000)]
Use bolded version of destinations

6 years agoFix translation keys for on ramps
Tom Hughes [Sun, 25 Feb 2018 20:56:17 +0000 (20:56 +0000)]
Fix translation keys for on ramps

6 years agoUpdate to rails 5.1.5
Tom Hughes [Sun, 25 Feb 2018 20:52:22 +0000 (20:52 +0000)]
Update to rails 5.1.5

6 years agoShow exit numbers for off ramps in OSRM directions
Tom Hughes [Sun, 25 Feb 2018 20:51:11 +0000 (20:51 +0000)]
Show exit numbers for off ramps in OSRM directions

Fixes #1768

6 years agoUpdate wiki page data
Mateusz Konieczny [Sat, 24 Feb 2018 18:31:09 +0000 (19:31 +0100)]
Update wiki page data

Closes #1767

6 years agoAllow admins and moderators to delete traces
biswesh456 [Sat, 24 Feb 2018 15:06:12 +0000 (20:36 +0530)]
Allow admins and moderators to delete traces

Fixes #1625

6 years agoMerge pull request #1758 from ardean80/patch-1
Andy Allan [Fri, 23 Feb 2018 03:01:11 +0000 (11:01 +0800)]
Merge pull request #1758 from ardean80/patch-1

Update country.rb

6 years agoMerge pull request #1732 from tomhughes/npemap
Andy Allan [Fri, 23 Feb 2018 02:23:22 +0000 (10:23 +0800)]
Merge pull request #1732 from tomhughes/npemap

Remove npemap as a source for UK postcodes

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Feb 2018 11:21:36 +0000 (12:21 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2018 08:22:31 +0000 (09:22 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoAdd libffi to requirements
Tom Hughes [Sun, 18 Feb 2018 10:22:34 +0000 (10:22 +0000)]
Add libffi to requirements

6 years agoUpdate country.rb
ardean80 [Fri, 16 Feb 2018 13:43:53 +0000 (14:43 +0100)]
Update country.rb

Without adding "Rails.root.join(...)" (or something else returning a complete path to the countries.xml file) this error occurred:
"No such file or directory @ rb_sysopen - config/countries.xml"
I think it happened because it could not find that file through a relative path.

6 years agoFix route path 'hovering' when marker positions are changed
Jamie Guthrie [Wed, 14 Feb 2018 19:54:53 +0000 (19:54 +0000)]
Fix route path 'hovering' when marker positions are changed

Closes #1755

6 years agoFix directions for roundabout without exit number
Jamie Guthrie [Thu, 15 Feb 2018 09:53:00 +0000 (09:53 +0000)]
Fix directions for roundabout without exit number

Closes #1756

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Feb 2018 09:00:41 +0000 (10:00 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate bundle
Tom Hughes [Wed, 14 Feb 2018 21:14:47 +0000 (21:14 +0000)]
Update bundle

6 years agoAvoid relying on global state to detect when we are dragging
Tom Hughes [Wed, 14 Feb 2018 17:58:01 +0000 (17:58 +0000)]
Avoid relying on global state to detect when we are dragging

We can't guarantee what order getRoute calls will finish in so
relying on global state is dangerous - capture it in the closure
instead so that each route knows what it is doing.

6 years agoStop map zooming out after dropping marker
Tom Hughes [Wed, 14 Feb 2018 01:19:30 +0000 (01:19 +0000)]
Stop map zooming out after dropping marker

Closes #1751

6 years agoChange directions start to say 'on road' rather than 'at end of road'
Jamie Guthrie [Wed, 14 Feb 2018 00:22:39 +0000 (00:22 +0000)]
Change directions start to say 'on road' rather than 'at end of road'

Closes #1750

6 years agoSmall comment fix
mmd-osm [Tue, 13 Feb 2018 22:24:07 +0000 (23:24 +0100)]
Small comment fix

6 years agoRemove BBOX expansion performance optimization
mmd-osm [Tue, 13 Feb 2018 22:07:30 +0000 (23:07 +0100)]
Remove BBOX expansion performance optimization

Closes #1749
Fixes #1742

6 years agoCorrectly swap from and to values when reversing directions
Jamie Guthrie [Wed, 14 Feb 2018 06:49:41 +0000 (06:49 +0000)]
Correctly swap from and to values when reversing directions

Closes #1752
Fixes #1748

6 years agoImprove OSRM directions for on and off ramps
Jamie Guthrie [Tue, 13 Feb 2018 17:28:09 +0000 (17:28 +0000)]
Improve OSRM directions for on and off ramps

Try and show both the name of the road being turned on to and the
destination depending on what is available.

Closes #1740

6 years agoAdd padding to directions popups
Jamie Guthrie [Tue, 13 Feb 2018 01:28:57 +0000 (01:28 +0000)]
Add padding to directions popups

Clicking on a direction step now pans to the popup, but includes some
padding so that the popup is not hidden in the corner of the screen.

Closes #1745

6 years agoUse both name and ref when naming roads in directions
Jamie Guthrie [Mon, 12 Feb 2018 07:29:31 +0000 (07:29 +0000)]
Use both name and ref when naming roads in directions

Closes #1741

6 years agoUpdate wiki_pages.yml, fix http url in update script
mmd-osm [Sun, 11 Feb 2018 16:40:31 +0000 (17:40 +0100)]
Update wiki_pages.yml, fix http url in update script

6 years agoFix broken translation
Tom Hughes [Mon, 12 Feb 2018 20:11:30 +0000 (20:11 +0000)]
Fix broken translation

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Feb 2018 07:40:25 +0000 (08:40 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUse https when redirecting to the render server
Tom Hughes [Fri, 9 Feb 2018 22:31:45 +0000 (22:31 +0000)]
Use https when redirecting to the render server

6 years agoUse correct class to disable zoom buttons
Tom Hughes [Fri, 9 Feb 2018 18:49:58 +0000 (18:49 +0000)]
Use correct class to disable zoom buttons

Fixes #1365

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Feb 2018 09:08:10 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUse configured protocol for URLs in diary feeds
Tom Hughes [Mon, 5 Feb 2018 22:31:27 +0000 (22:31 +0000)]
Use configured protocol for URLs in diary feeds

6 years agoUse configured server protocol for shared URLs
Tom Hughes [Mon, 5 Feb 2018 21:03:45 +0000 (21:03 +0000)]
Use configured server protocol for shared URLs

Closes #939

6 years agoUse configured server protocol for links in e-mail notifications
Tom Hughes [Mon, 5 Feb 2018 21:01:36 +0000 (21:01 +0000)]
Use configured server protocol for links in e-mail notifications

Closes #1341

6 years agoMake OSM::GreatCircle clamp results to the globe
Tom Hughes [Sun, 4 Feb 2018 17:42:40 +0000 (17:42 +0000)]
Make OSM::GreatCircle clamp results to the globe

6 years agoMake travis build 3GL quad tile functions
Tom Hughes [Sun, 4 Feb 2018 17:38:55 +0000 (17:38 +0000)]
Make travis build 3GL quad tile functions

6 years agoAdd tests for quad tiles
Tom Hughes [Sun, 4 Feb 2018 17:33:44 +0000 (17:33 +0000)]
Add tests for quad tiles

6 years agoFix C version of QuadTile#tiles_for_area to return correct tiles
Tom Hughes [Sun, 4 Feb 2018 17:22:06 +0000 (17:22 +0000)]
Fix C version of QuadTile#tiles_for_area to return correct tiles

6 years agoRemove npemap as a source for UK postcodes
Tom Hughes [Mon, 29 Jan 2018 18:53:57 +0000 (18:53 +0000)]
Remove npemap as a source for UK postcodes

6 years agoMerge remote-tracking branch 'upstream/pull/1704'
Tom Hughes [Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)]
Merge remote-tracking branch 'upstream/pull/1704'

6 years agoAdd marker at trace start coordinate
Biswesh Mohapatra [Sun, 4 Feb 2018 00:32:35 +0000 (06:02 +0530)]
Add marker at trace start coordinate

Fixes #1676
Closes #1731

6 years agoRemove duplicate link: traces >> more
Biswesh Mohapatra [Sat, 3 Feb 2018 23:16:12 +0000 (04:46 +0530)]
Remove duplicate link: traces >> more

Fixes #1699
Closes #1730

6 years agoAllow lat/lon from the URL to take precedence when routing
Tom Hughes [Sat, 3 Feb 2018 16:39:39 +0000 (16:39 +0000)]
Allow lat/lon from the URL to take precedence when routing

6 years agoGo through the router when reversing directions
Tom Hughes [Sat, 3 Feb 2018 16:21:35 +0000 (16:21 +0000)]
Go through the router when reversing directions

6 years agoMerge remote-tracking branch 'upstream/pull/1693'
Tom Hughes [Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)]
Merge remote-tracking branch 'upstream/pull/1693'

6 years agoMerge remote-tracking branch 'upstream/pull/1727'
Tom Hughes [Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)]
Merge remote-tracking branch 'upstream/pull/1727'

6 years agoFix typo
Mikkel Kirkgaard Nielsen [Thu, 1 Feb 2018 20:37:40 +0000 (21:37 +0100)]
Fix typo

Closes #1728

6 years agoUse https for default style tiles
Tom Hughes [Thu, 1 Feb 2018 20:17:01 +0000 (20:17 +0000)]
Use https for default style tiles

6 years agoUpdate to iD v2.6.1
Bryan Housel [Thu, 1 Feb 2018 16:43:19 +0000 (11:43 -0500)]
Update to iD v2.6.1

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Feb 2018 09:03:02 +0000 (10:03 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoAllow cross domain flash access from http sites
Tom Hughes [Tue, 30 Jan 2018 12:59:47 +0000 (12:59 +0000)]
Allow cross domain flash access from http sites

6 years agoNormalise newlines in incoming emails
Tom Hughes [Tue, 30 Jan 2018 00:27:01 +0000 (00:27 +0000)]
Normalise newlines in incoming emails

Fixes #1708

6 years agoMerge remote-tracking branch 'upstream/pull/1726'
Tom Hughes [Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/1726'

6 years agoUpdate query icon to display cursor with '?'
Bryan Housel [Mon, 29 Jan 2018 18:21:23 +0000 (13:21 -0500)]
Update query icon to display cursor with '?'
(fixes #1712)

6 years agoAdd '+' to note icon ("add a note to the map")
Bryan Housel [Mon, 29 Jan 2018 17:25:00 +0000 (12:25 -0500)]
Add '+' to note icon ("add a note to the map")

6 years agoRework FOSS4g-IT and FOSSGIS banners to leave space for close 'X'
Bryan Housel [Mon, 29 Jan 2018 15:11:41 +0000 (10:11 -0500)]
Rework FOSS4g-IT and FOSSGIS banners to leave space for close 'X'

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Jan 2018 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate Nominatim description terms
Sarah Hoffmann [Thu, 25 Jan 2018 20:32:26 +0000 (21:32 +0100)]
Update Nominatim description terms

6 years agoAdd links to the trademark policy
Simon Poole [Thu, 25 Jan 2018 19:20:07 +0000 (20:20 +0100)]
Add links to the trademark policy

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Jan 2018 04:29:24 +0000 (05:29 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoFix rubocop warnings
Tom Hughes [Wed, 24 Jan 2018 14:37:37 +0000 (14:37 +0000)]
Fix rubocop warnings

6 years agoUpdate paperclip
Tom Hughes [Wed, 24 Jan 2018 14:36:52 +0000 (14:36 +0000)]
Update paperclip

6 years agoAdd support for compressed request bodies
Tom Hughes [Sun, 21 Jan 2018 15:50:32 +0000 (15:50 +0000)]
Add support for compressed request bodies

6 years agoMerge remote-tracking branch 'upstream/pull/1721'
Tom Hughes [Wed, 24 Jan 2018 14:23:56 +0000 (14:23 +0000)]
Merge remote-tracking branch 'upstream/pull/1721'

6 years agoadd banner for the Italian OSM conference 2018
Martin Koppenhoefer [Wed, 24 Jan 2018 13:10:20 +0000 (14:10 +0100)]
add banner for the Italian OSM conference 2018

6 years agocleanup banners: remove past conferences from 2017
Peter Barth [Mon, 22 Jan 2018 20:40:39 +0000 (21:40 +0100)]
cleanup banners: remove past conferences from 2017

6 years agoadd banner for this year's FOSSGIS conference
Peter Barth [Mon, 22 Jan 2018 20:40:27 +0000 (21:40 +0100)]
add banner for this year's FOSSGIS conference

6 years agoFix new rubocop warnings
Tom Hughes [Mon, 22 Jan 2018 14:36:16 +0000 (14:36 +0000)]
Fix new rubocop warnings

6 years agoUpdate bundle
Tom Hughes [Mon, 22 Jan 2018 14:17:52 +0000 (14:17 +0000)]
Update bundle

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jan 2018 14:19:10 +0000 (15:19 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoUpdate to iD v2.6.0
Bryan Housel [Sun, 21 Jan 2018 15:52:31 +0000 (10:52 -0500)]
Update to iD v2.6.0