]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1117'
Victor Grousset [Wed, 30 Dec 2015 17:17:05 +0000 (18:17 +0100)]
Add ImageMagick to list of packages to install
Simon Poole [Mon, 28 Dec 2015 14:34:38 +0000 (15:34 +0100)]
It's a magnifying glass, stupid...
Grant Slater [Sat, 26 Dec 2015 23:53:59 +0000 (23:53 +0000)]
Add Host: to robots.txt
Ben Marchant [Wed, 23 Dec 2015 18:35:27 +0000 (18:35 +0000)]
Update rss.rss.builder
Change from hard coding URL to using image_path method that wil
resolve to the correct asset path.
Tom Hughes [Mon, 21 Dec 2015 16:11:02 +0000 (16:11 +0000)]
Fix deprecation warnings in migrations
Tom Hughes [Sun, 20 Dec 2015 00:19:16 +0000 (00:19 +0000)]
Add rel=nofollow to links to tagless nodes in browse pages
Tom Hughes [Wed, 16 Dec 2015 16:21:09 +0000 (16:21 +0000)]
Update Potlatch 2 to
2.4-16-g0c126d0 build
Tom Hughes [Sat, 12 Dec 2015 16:08:09 +0000 (16:08 +0000)]
Preserve URL fragments through external authentication
Fixes #1102
Tom Hughes [Sat, 12 Dec 2015 11:42:36 +0000 (11:42 +0000)]
Remove inline javascript from login page
Bryan Housel [Fri, 11 Dec 2015 21:28:26 +0000 (13:28 -0800)]
Update to iD v1.8.3
Bryan Housel [Fri, 11 Dec 2015 02:48:22 +0000 (18:48 -0800)]
Remove test for iD and Internet Explorer
Bryan Housel [Fri, 11 Dec 2015 02:34:18 +0000 (18:34 -0800)]
Support using iD on Internet Explorer 11 and above
Bryan Housel [Fri, 11 Dec 2015 02:02:52 +0000 (18:02 -0800)]
Update to iD v1.8.2
Tom Hughes [Thu, 10 Dec 2015 09:50:34 +0000 (09:50 +0000)]
Update documentation to say ruby 2.0 is required
Paul Norman [Thu, 10 Dec 2015 08:50:55 +0000 (00:50 -0800)]
Remove 9.0 extension install instructions
PostgreSQL 9.0 is end of life, and having both extension install methods in documentation is often a source of confusion.
Tom Hughes [Mon, 7 Dec 2015 15:59:13 +0000 (15:59 +0000)]
Enable https for humanitarian layer
Tom Hughes [Mon, 7 Dec 2015 15:54:06 +0000 (15:54 +0000)]
Use correct title in og:title for pages with no title
Fixes #1098
Tom Hughes [Mon, 7 Dec 2015 14:57:19 +0000 (14:57 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1099'
Tom Hughes [Mon, 7 Dec 2015 14:31:55 +0000 (14:31 +0000)]
Use ruby 2.1.7 for travis
Ilya Zverev [Mon, 30 Nov 2015 07:42:07 +0000 (02:42 -0500)]
Facebook emails are verified
Per https://developers.facebook.com/docs/graph-api/reference/user the
offical description of the email field is:
> The person's primary email address listed on their profile. This
> field will not be returned if no valid email address is available
Therefore we can treat the fact that the email is returned as proof
that it has been verified.
Tom Hughes [Mon, 7 Dec 2015 14:21:57 +0000 (14:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1082'
Tom Hughes [Mon, 7 Dec 2015 14:11:35 +0000 (14:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1085'
Tom Hughes [Mon, 7 Dec 2015 13:52:20 +0000 (13:52 +0000)]
Fix issues with bogus % encoded sequences in URLs
Add a URI sanitizer to the rack stack avoid rack throwing
exceptions on the server side, and ignore errors decoding
components on the client side.
Fixes #1101
Florian Schäfer [Sat, 5 Dec 2015 20:59:27 +0000 (21:59 +0100)]
Allow closing the sidebar when a timeout occured
Tom Hughes [Mon, 30 Nov 2015 08:56:26 +0000 (08:56 +0000)]
Fix display of raw HTML in flash message
Fixes #1095
Bryan Housel [Mon, 23 Nov 2015 19:00:25 +0000 (14:00 -0500)]
Don't update urlhash while in intro
This should cut down on the errant edits in Three Rivers, MI.
Users getting stuck in walkthrough are probably refreshing their browser and
returning to the location in the walkthrough where they got stuck.
Tom Hughes [Sat, 21 Nov 2015 16:21:30 +0000 (16:21 +0000)]
Switch back to the upsteam image_optim
Tom Hughes [Thu, 19 Nov 2015 21:37:05 +0000 (21:37 +0000)]
Update to rails 4.2.5
Tom Hughes [Thu, 19 Nov 2015 21:35:48 +0000 (21:35 +0000)]
Fix rubocop warnings
Tom Hughes [Thu, 19 Nov 2015 21:29:23 +0000 (21:29 +0000)]
Update image_optim and disable cleanupIDs plugin
Aditya Prakash [Fri, 13 Nov 2015 04:11:47 +0000 (09:41 +0530)]
Hide .describe_location on push and popstate
Edward17 [Sun, 8 Nov 2015 20:55:57 +0000 (21:55 +0100)]
Icon for shop=car_parts added
Bryan Housel [Sun, 8 Nov 2015 04:18:03 +0000 (23:18 -0500)]
Update to iD v1.8.0
Tom Hughes [Thu, 5 Nov 2015 11:44:08 +0000 (11:44 +0000)]
Pass title to opengraph routine
Andrew Hain [Sun, 1 Nov 2015 22:24:16 +0000 (22:24 +0000)]
Update key and data browser for new road colours
Update colours for main roads to match new style and replace
references to trunk, primary and secondary in the key with a
generic reference to main roads as trunk, primary and secondary
here have OSM specific meaning.
Also change road icons in the data browser to be the same colours
as the revised colours in the standard map style. The top and bottom
lines for motorway, trunk and primary are in the casing colours,
secondary and tertiary are 50% intensity of casing colour. Tertiary
is made deeper.
Tom Hughes [Fri, 30 Oct 2015 19:11:25 +0000 (19:11 +0000)]
Don't send note comment notifications to deleted users
Tom Hughes [Fri, 30 Oct 2015 19:01:09 +0000 (19:01 +0000)]
Don't send changeset comment notifications to deleted users
Tom Hughes [Tue, 27 Oct 2015 11:57:40 +0000 (11:57 +0000)]
Add og:description to OpenGraph tags
Tom Hughes [Tue, 27 Oct 2015 11:52:40 +0000 (11:52 +0000)]
Add og:url to OpenGraph tags
Tom Hughes [Tue, 27 Oct 2015 11:49:06 +0000 (11:49 +0000)]
Use PNG logo for og:image
Tom Hughes [Mon, 26 Oct 2015 22:27:00 +0000 (22:27 +0000)]
Add more detail to OpenGraph tags
Closes #1073
Tom Hughes [Mon, 26 Oct 2015 15:51:59 +0000 (15:51 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1078'
Tom Hughes [Mon, 26 Oct 2015 15:45:32 +0000 (15:45 +0000)]
Update leaflet to 0.7.7
Aditya Prakash [Mon, 26 Oct 2015 07:03:57 +0000 (12:33 +0530)]
Remove inline property of secondary links on diary page
Siebrand Mazeland [Thu, 22 Oct 2015 09:37:14 +0000 (11:37 +0200)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 14 Oct 2015 11:00:07 +0000 (13:00 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 12 Oct 2015 20:17:57 +0000 (21:17 +0100)]
User ferry icon for kFerryEnter with Mapzen routing
Tom Hughes [Mon, 12 Oct 2015 20:15:47 +0000 (21:15 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1068'
Simon Legner [Tue, 6 Oct 2015 19:08:35 +0000 (21:08 +0200)]
Add ferry routing information for OSRM
Relates to #1000.
Uses instruction code 18 to represent a ferry instruction. Ferry icon
taken from Mapbox Maki set (CC0).
Andrew Zaborowski [Sun, 4 Oct 2015 00:13:57 +0000 (02:13 +0200)]
Close html <source> tags
Apparently this unclosed tag didn't break rendering but judging from the
fact that this was the only unclosed tag and was introduced recently,
it probably wasn't intended. The unit tests did expect the tag to be
closed.
Tom Hughes [Fri, 2 Oct 2015 08:01:58 +0000 (09:01 +0100)]
Switch back to the upstream omniauth-google-oauth2 gem
Out patch is included now, so there is no need to use our version.
Tom Hughes [Wed, 30 Sep 2015 20:56:57 +0000 (21:56 +0100)]
Improve error handling for routing engines
Tom Hughes [Wed, 30 Sep 2015 18:56:02 +0000 (19:56 +0100)]
Make travis copy example.application.yml to application.yml
Tom Hughes [Wed, 30 Sep 2015 18:34:14 +0000 (19:34 +0100)]
Ensure assets are recompiled when configuration changes
Tom Hughes [Wed, 30 Sep 2015 16:22:27 +0000 (17:22 +0100)]
Scale total distance to metres for Mapzen
Tom Hughes [Tue, 29 Sep 2015 14:37:04 +0000 (15:37 +0100)]
Add support for Mapzen's Valhalla routing engine
Tom Hughes [Mon, 28 Sep 2015 14:01:41 +0000 (15:01 +0100)]
Fix jshint warning
Tom Hughes [Mon, 28 Sep 2015 13:47:32 +0000 (14:47 +0100)]
Use jsonp for MapQuest as CORS doesn't seem to be working
Tom Hughes [Mon, 28 Sep 2015 13:43:12 +0000 (14:43 +0100)]
Allow jQuery to construct the routing URLs
Tom Hughes [Mon, 28 Sep 2015 12:54:49 +0000 (13:54 +0100)]
Make MapQuest API key conditional
Tom Hughes [Mon, 28 Sep 2015 12:42:00 +0000 (13:42 +0100)]
Move the MapQuest API key to the configuration file
Tom Hughes [Mon, 28 Sep 2015 07:38:02 +0000 (08:38 +0100)]
Update Potlatch 2 to
2.4-12-g7158c69 build
Tom Hughes [Fri, 18 Sep 2015 18:30:08 +0000 (19:30 +0100)]
Sprockets 3 seems to be OK now
Siebrand Mazeland [Fri, 25 Sep 2015 14:12:45 +0000 (16:12 +0200)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Wed, 16 Sep 2015 04:17:27 +0000 (00:17 -0400)]
Allow iD in iframe to request fullscreen
Bryan Housel [Wed, 16 Sep 2015 04:02:51 +0000 (00:02 -0400)]
Update to iD v1.7.4
Holger Jeromin [Mon, 14 Sep 2015 14:52:39 +0000 (16:52 +0200)]
Add srcset to img tags inside picture elements
Some browsers (in particular Safari on iOS) don't support picture
yet but do support srcset on the img tag.
Holger Jeromin [Mon, 14 Sep 2015 13:23:54 +0000 (15:23 +0200)]
Converted inkscape font info to font-family
Tom Hughes [Sun, 13 Sep 2015 18:29:57 +0000 (19:29 +0100)]
Use SVG for sprites for better high DPI support
Tom Hughes [Sun, 13 Sep 2015 20:58:34 +0000 (21:58 +0100)]
Use picture elements to render some more graphics as SVG
Holger Jeromin [Sat, 12 Sep 2015 20:55:46 +0000 (22:55 +0200)]
Removed bogus filter:url(#filter6591-2); from sprite
The SVG file had a buggy filter in it, which prevented chrome
fro loading most icons from it.
Tom Hughes [Sun, 13 Sep 2015 10:46:13 +0000 (11:46 +0100)]
Disable jpegtran
Holger Jeromin [Sat, 12 Sep 2015 18:50:48 +0000 (20:50 +0200)]
Use HTML5 picture element to prefer SVG logo
Tom Hughes [Sun, 13 Sep 2015 09:48:33 +0000 (10:48 +0100)]
Use image_optim to optimize SVG assets with svgo
Tom Hughes [Sun, 13 Sep 2015 08:53:01 +0000 (09:53 +0100)]
Update bundle
Tom Hughes [Thu, 10 Sep 2015 09:11:39 +0000 (10:11 +0100)]
Fix interpolation errors
Siebrand Mazeland [Thu, 10 Sep 2015 08:38:58 +0000 (10:38 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 2 Sep 2015 18:05:24 +0000 (19:05 +0100)]
Update to Leaflet 0.7.5
Tom Hughes [Tue, 1 Sep 2015 18:08:44 +0000 (19:08 +0100)]
Update to Leaflet 0.7.4
Tom Hughes [Thu, 27 Aug 2015 20:55:48 +0000 (21:55 +0100)]
Update test for changes in #903
Tom Hughes [Thu, 27 Aug 2015 20:46:56 +0000 (21:46 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/891'
Tom Hughes [Thu, 27 Aug 2015 20:44:44 +0000 (21:44 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/903'
Tom Hughes [Thu, 27 Aug 2015 20:30:50 +0000 (21:30 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1040'
Tom Hughes [Thu, 27 Aug 2015 20:21:45 +0000 (21:21 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1045'
Tom Hughes [Thu, 27 Aug 2015 20:18:05 +0000 (21:18 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1043'
Tom Hughes [Thu, 27 Aug 2015 19:43:50 +0000 (20:43 +0100)]
Mark some flash messages as html safe
Simon Legner [Thu, 27 Aug 2015 18:50:05 +0000 (20:50 +0200)]
Display number of comments in changeset list
Simon Legner [Wed, 26 Aug 2015 21:31:36 +0000 (23:31 +0200)]
Close layers panel on double-clicking a layer
Relates to #465.
Simon Legner [Wed, 26 Aug 2015 19:38:39 +0000 (21:38 +0200)]
Directions, read "to" location in URL - fixes #998
Tom Hughes [Mon, 24 Aug 2015 21:32:00 +0000 (22:32 +0100)]
Update to rails 4.2.4
Tom Hughes [Mon, 24 Aug 2015 09:49:04 +0000 (10:49 +0100)]
Don't treat flash messages as raw
This will likely break some things, but we should fix them
properly so that the rails auto-escaping can work.
Fixes #1027
Tom Hughes [Wed, 19 Aug 2015 07:35:41 +0000 (08:35 +0100)]
Test rendering of OAuth authorization page
Tom Hughes [Wed, 19 Aug 2015 07:22:00 +0000 (08:22 +0100)]
Add missing parenthesis
Fixes #1037
Tom Hughes [Tue, 18 Aug 2015 19:57:14 +0000 (20:57 +0100)]
Fix new rubocopy warnings
Tom Hughes [Tue, 18 Aug 2015 19:19:36 +0000 (20:19 +0100)]
Update bundle
Tom Hughes [Tue, 18 Aug 2015 18:19:35 +0000 (19:19 +0100)]
Make button on OAuth authorization screen translatable
Fixes #1025
Tom Hughes [Tue, 18 Aug 2015 18:09:11 +0000 (19:09 +0100)]
Fix double XML declaration on trace RSS feeds
Fixes #1034
Holger Jeromin [Tue, 18 Aug 2015 08:31:29 +0000 (10:31 +0200)]
added missing wording for note "not found" and "timeout"
Tom Hughes [Fri, 14 Aug 2015 18:55:11 +0000 (19:55 +0100)]
Apply a timeout to most changeset API calls