]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)]
Merge remote-tracking branch 'upstream/pull/1693'
Tom Hughes [Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)]
Merge remote-tracking branch 'upstream/pull/1727'
Mikkel Kirkgaard Nielsen [Thu, 1 Feb 2018 20:37:40 +0000 (21:37 +0100)]
Fix typo
Closes #1728
Tom Hughes [Thu, 1 Feb 2018 20:17:01 +0000 (20:17 +0000)]
Use https for default style tiles
Bryan Housel [Thu, 1 Feb 2018 16:43:19 +0000 (11:43 -0500)]
Update to iD v2.6.1
translatewiki.net [Thu, 1 Feb 2018 09:03:02 +0000 (10:03 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 30 Jan 2018 12:59:47 +0000 (12:59 +0000)]
Allow cross domain flash access from http sites
Tom Hughes [Tue, 30 Jan 2018 00:27:01 +0000 (00:27 +0000)]
Normalise newlines in incoming emails
Fixes #1708
Tom Hughes [Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/1726'
Bryan Housel [Mon, 29 Jan 2018 18:21:23 +0000 (13:21 -0500)]
Update query icon to display cursor with '?'
(fixes #1712)
Bryan Housel [Mon, 29 Jan 2018 17:25:00 +0000 (12:25 -0500)]
Add '+' to note icon ("add a note to the map")
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'
translatewiki.net [Mon, 29 Jan 2018 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.
Sarah Hoffmann [Thu, 25 Jan 2018 20:32:26 +0000 (21:32 +0100)]
Update Nominatim description terms
Simon Poole [Thu, 25 Jan 2018 19:20:07 +0000 (20:20 +0100)]
Add links to the trademark policy
translatewiki.net [Thu, 25 Jan 2018 04:29:24 +0000 (05:29 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 24 Jan 2018 14:37:37 +0000 (14:37 +0000)]
Fix rubocop warnings
Tom Hughes [Wed, 24 Jan 2018 14:36:52 +0000 (14:36 +0000)]
Update paperclip
Tom Hughes [Sun, 21 Jan 2018 15:50:32 +0000 (15:50 +0000)]
Add support for compressed request bodies
Tom Hughes [Wed, 24 Jan 2018 14:23:56 +0000 (14:23 +0000)]
Merge remote-tracking branch 'upstream/pull/1721'
Martin Koppenhoefer [Wed, 24 Jan 2018 13:10:20 +0000 (14:10 +0100)]
add banner for the Italian OSM conference 2018
Peter Barth [Mon, 22 Jan 2018 20:40:39 +0000 (21:40 +0100)]
cleanup banners: remove past conferences from 2017
Peter Barth [Mon, 22 Jan 2018 20:40:27 +0000 (21:40 +0100)]
add banner for this year's FOSSGIS conference
Tom Hughes [Mon, 22 Jan 2018 14:36:16 +0000 (14:36 +0000)]
Fix new rubocop warnings
Tom Hughes [Mon, 22 Jan 2018 14:17:52 +0000 (14:17 +0000)]
Update bundle
translatewiki.net [Mon, 22 Jan 2018 14:19:10 +0000 (15:19 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Sun, 21 Jan 2018 15:52:31 +0000 (10:52 -0500)]
Update to iD v2.6.0
Tom Hughes [Thu, 18 Jan 2018 17:38:42 +0000 (17:38 +0000)]
Use no-r2 comment to block RTL gem from changing sprites
Fixes #1717
Tom Hughes [Thu, 18 Jan 2018 17:32:33 +0000 (17:32 +0000)]
Update leaflet to 1.3.1
translatewiki.net [Thu, 18 Jan 2018 07:47:01 +0000 (08:47 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 17 Jan 2018 12:32:58 +0000 (12:32 +0000)]
Update Potlatch 2 to
2.5-21-gec1befed build
Tom Hughes [Mon, 15 Jan 2018 10:25:21 +0000 (10:25 +0000)]
Update the Leaflet.contextmenu plugin to 1.5.0
Tom Hughes [Mon, 15 Jan 2018 10:23:22 +0000 (10:23 +0000)]
Update leaflet to 1.3.0
translatewiki.net [Mon, 15 Jan 2018 07:08:50 +0000 (08:08 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 13 Jan 2018 15:57:31 +0000 (15:57 +0000)]
Allow cross domain flash access from http sites
Tom Hughes [Sat, 13 Jan 2018 10:41:26 +0000 (10:41 +0000)]
Enable cross origin requests for diary RSS feeds
Fixes #1714
Tom Hughes [Sat, 13 Jan 2018 10:35:42 +0000 (10:35 +0000)]
Merge remote-tracking branch 'upstream/pull/1707'
Tom Hughes [Thu, 11 Jan 2018 19:44:20 +0000 (19:44 +0000)]
Allow apache to control the HSTS setting
Tom Hughes [Thu, 11 Jan 2018 19:19:36 +0000 (19:19 +0000)]
Allow apache to control the HSTS setting
translatewiki.net [Thu, 11 Jan 2018 07:10:41 +0000 (08:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 8 Jan 2018 20:30:51 +0000 (20:30 +0000)]
Fix jshint warning
Tom Hughes [Mon, 8 Jan 2018 20:18:21 +0000 (20:18 +0000)]
Convert various URLs to https
Tom Hughes [Mon, 8 Jan 2018 10:49:36 +0000 (10:49 +0000)]
Use https for nominatim
Tom Hughes [Thu, 4 Jan 2018 22:34:22 +0000 (22:34 +0000)]
Monkey patch OAuth to allow http signatures on https requests
translatewiki.net [Mon, 8 Jan 2018 08:18:17 +0000 (09:18 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jan 2018 09:23:00 +0000 (10:23 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 2 Jan 2018 18:45:20 +0000 (18:45 +0000)]
Remove dependencies on mapzen services
translatewiki.net [Mon, 1 Jan 2018 14:41:07 +0000 (15:41 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Dec 2017 14:23:29 +0000 (15:23 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 21 Dec 2017 07:44:26 +0000 (08:44 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 19 Dec 2017 17:43:53 +0000 (17:43 +0000)]
Fix tests that only worked if object 400 didn't exist
mmd-osm [Tue, 19 Dec 2017 17:31:34 +0000 (17:31 +0000)]
Revoking administrator role on current user should fail
Fixes #1697
Closes #1701
mmd-osm [Mon, 18 Dec 2017 21:13:41 +0000 (21:13 +0000)]
Added explanation about discussions on open changesets
Closes #1705
translatewiki.net [Mon, 18 Dec 2017 16:56:33 +0000 (17:56 +0100)]
Localisation updates from https://translatewiki.net.
J Guthrie [Fri, 1 Dec 2017 01:38:23 +0000 (01:38 +0000)]
Added 'Reverse Directions' link
Added a text link that reverses the directions of the planned route
Guillaume RISCHARD [Sat, 16 Dec 2017 15:15:52 +0000 (16:15 +0100)]
Remove support for soon discontinued josm remote https endpoint
Tom Hughes [Thu, 14 Dec 2017 16:03:48 +0000 (16:03 +0000)]
Move advice on what to enter in a note to guide text
translatewiki.net [Thu, 14 Dec 2017 07:41:46 +0000 (08:41 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Dec 2017 07:10:41 +0000 (08:10 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 9 Dec 2017 10:52:19 +0000 (10:52 +0000)]
Don't add system tests if the user specified which tests to run
Martijn van Exel [Thu, 7 Dec 2017 17:25:25 +0000 (10:25 -0700)]
A couple more tweaks to Mac install docs
* The URL for the homebrew site has changed.
* Added phantomjs (test dependency)
Closes #1700
Martijn van Exel [Thu, 7 Dec 2017 09:26:36 +0000 (09:26 +0000)]
Add explicit install instructions for libxml2 on MacOS
Closes #1698
translatewiki.net [Thu, 7 Dec 2017 08:12:58 +0000 (09:12 +0100)]
Localisation updates from https://translatewiki.net.
Guillaume RISCHARD [Wed, 6 Dec 2017 13:19:40 +0000 (13:19 +0000)]
Enable image compression utils for image_optim
Closes #1696
Tom Hughes [Mon, 4 Dec 2017 21:19:38 +0000 (21:19 +0000)]
Use a memory cache for sessions when memcache is not configured
Fixes #1695
translatewiki.net [Mon, 4 Dec 2017 08:51:04 +0000 (09:51 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 4 Dec 2017 07:54:19 +0000 (07:54 +0000)]
Make changeset#query preload users, tags and comments
Tom Hughes [Fri, 1 Dec 2017 19:21:42 +0000 (19:21 +0000)]
Make the AMF getway_old call parse times as UTC
Although it's not entirely clear how to interpret a timestamp from
a client the production servers have effectively been parsing them
as UTC because they run in the UTC time zone all year.
Using Time.zone to do the parse forces it to happen in the rails time
zone rather than the system time zone, which defaults to UTC as well.
Fixes #1688
translatewiki.net [Thu, 30 Nov 2017 07:49:14 +0000 (08:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 29 Nov 2017 23:07:19 +0000 (23:07 +0000)]
Use decoded strings when parsing XML responses from geocoders
Fixes #1690
Tom Hughes [Wed, 29 Nov 2017 20:35:17 +0000 (20:35 +0000)]
Update rack-test and patch test issues
Tom Hughes [Wed, 29 Nov 2017 16:24:12 +0000 (16:24 +0000)]
Update bundle
translatewiki.net [Mon, 27 Nov 2017 07:12:19 +0000 (08:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 25 Nov 2017 12:04:02 +0000 (12:04 +0000)]
Extend form-action policies for Chrome
It seems that unlike other browsers Chrome requires that if a form
submission redirects that the redirected URL also match the form-action
policy rather than just requiring the original URL to match.
Tom Hughes [Fri, 24 Nov 2017 16:20:50 +0000 (16:20 +0000)]
Remove inline javascript from user settings page
Tom Hughes [Fri, 24 Nov 2017 08:38:51 +0000 (08:38 +0000)]
Allow iD to fetch gpx files from arbitrary locations
Tom Hughes [Fri, 24 Nov 2017 01:09:27 +0000 (01:09 +0000)]
Fix security policy for mapillary in iD
Tom Hughes [Fri, 24 Nov 2017 00:46:27 +0000 (00:46 +0000)]
Fix remote editing security policy
Tom Hughes [Fri, 24 Nov 2017 00:43:14 +0000 (00:43 +0000)]
Add security policy for remote control editing
Tom Hughes [Fri, 24 Nov 2017 00:10:38 +0000 (00:10 +0000)]
Allow iD to connect to nominatim
Tom Hughes [Thu, 23 Nov 2017 22:39:05 +0000 (22:39 +0000)]
Allow third party images in user content
Tom Hughes [Thu, 23 Nov 2017 22:22:01 +0000 (22:22 +0000)]
Allow images to be loaded from piwik
Tom Hughes [Thu, 23 Nov 2017 13:24:47 +0000 (13:24 +0000)]
Merge remote-tracking branch 'upstream/pull/1687'
Andy Allan [Thu, 23 Nov 2017 11:31:15 +0000 (11:31 +0000)]
Update CONTRIBUTING to remove reference to cruise and use link to Travis
translatewiki.net [Thu, 23 Nov 2017 06:48:25 +0000 (07:48 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 22 Nov 2017 15:51:32 +0000 (15:51 +0000)]
Add the OpenStreetMap Blog to the list of community links
Although the content is currently duplicated into the blog aggregator,
it's still worth having an explicit link, and making it the first one,
since it contains entries of more significant interest to the community.
Andy Allan [Wed, 22 Nov 2017 14:57:26 +0000 (14:57 +0000)]
Put specific page titles at the start
The makes the shortened titles commonly shown on browser tabs more
useful.
Andy Allan [Wed, 22 Nov 2017 14:42:16 +0000 (14:42 +0000)]
Merge branch 'pull/843' into titles
Andy Allan [Wed, 22 Nov 2017 10:47:18 +0000 (10:47 +0000)]
Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p
Refs #139
translatewiki.net [Mon, 20 Nov 2017 08:29:08 +0000 (09:29 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 19 Nov 2017 19:49:39 +0000 (19:49 +0000)]
Make context menu use from/to for directions
This ensures that the router will try to geocode the values rather
than assuming that they are latitude/longitude pairs.
Fixes #1684
Tom Hughes [Thu, 16 Nov 2017 10:17:22 +0000 (10:17 +0000)]
Add openstreetcam.org to security policy for iD
Tom Hughes [Thu, 16 Nov 2017 10:17:06 +0000 (10:17 +0000)]
Merge remote-tracking branch 'upstream/pull/1682'
translatewiki.net [Thu, 16 Nov 2017 10:10:07 +0000 (11:10 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Thu, 16 Nov 2017 05:50:21 +0000 (00:50 -0500)]
Update to iD v2.5.1
Tom Hughes [Wed, 15 Nov 2017 13:01:38 +0000 (13:01 +0000)]
Make system tests run by default
Tom Hughes [Sun, 29 Oct 2017 20:58:23 +0000 (20:58 +0000)]
Add framework for system tests
Andy Allan [Wed, 15 Nov 2017 18:24:14 +0000 (18:24 +0000)]
Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into pnorman-wheres_this
Fixes #412
translatewiki.net [Mon, 13 Nov 2017 08:26:31 +0000 (09:26 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Fri, 10 Nov 2017 20:57:37 +0000 (15:57 -0500)]
Add iD disable_features parameter