]> git.openstreetmap.org Git - rails.git/log
rails.git
8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 3 Mar 2016 07:29:44 +0000 (08:29 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to iD v1.9.0
Bryan Housel [Tue, 1 Mar 2016 22:17:36 +0000 (17:17 -0500)]
Update to iD v1.9.0

8 years agoUpdate rails to 4.2.5.2
Tom Hughes [Mon, 29 Feb 2016 22:19:18 +0000 (22:19 +0000)]
Update rails to 4.2.5.2

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 29 Feb 2016 16:24:23 +0000 (17:24 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoChange "blocks received" to "active blocks"
Tom Hughes [Mon, 29 Feb 2016 14:26:50 +0000 (14:26 +0000)]
Change "blocks received" to "active blocks"

Fixes #1168

8 years agoMake capitalisation of user menu entries consistent
Tom Hughes [Mon, 29 Feb 2016 14:26:20 +0000 (14:26 +0000)]
Make capitalisation of user menu entries consistent

8 years agoTreeat user as logged in after a password reset
Tom Hughes [Fri, 26 Feb 2016 16:30:32 +0000 (16:30 +0000)]
Treeat user as logged in after a password reset

Fixes #1160

8 years agoPreserve username and "remember me" when login fails
Tom Hughes [Fri, 26 Feb 2016 15:32:11 +0000 (15:32 +0000)]
Preserve username and "remember me" when login fails

Fixes #1159

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 25 Feb 2016 08:24:08 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 22 Feb 2016 07:48:32 +0000 (08:48 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 19 Feb 2016 14:23:26 +0000 (15:23 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1154'
Tom Hughes [Mon, 15 Feb 2016 21:09:59 +0000 (21:09 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1154'

8 years agoCreate new translation string for deleted user
Aditya Prakash [Mon, 15 Feb 2016 17:05:56 +0000 (22:35 +0530)]
Create new translation string for deleted user

8 years agoDo not hyperlink profiles of deleted users
Aditya Prakash [Mon, 15 Feb 2016 12:58:33 +0000 (18:28 +0530)]
Do not hyperlink profiles of deleted users

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 15 Feb 2016 06:18:10 +0000 (07:18 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoAvoid using Rails.application.assets as it no longer set in production
Tom Hughes [Thu, 11 Feb 2016 10:15:19 +0000 (10:15 +0000)]
Avoid using Rails.application.assets as it no longer set in production

8 years agoUpdate rubocopy config after bug fixes
Tom Hughes [Thu, 11 Feb 2016 07:12:41 +0000 (07:12 +0000)]
Update rubocopy config after bug fixes

8 years agoRemove sprockets-rails version restriction now konacha is fixed
Tom Hughes [Thu, 11 Feb 2016 07:10:42 +0000 (07:10 +0000)]
Remove sprockets-rails version restriction now konacha is fixed

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 11 Feb 2016 06:36:36 +0000 (07:36 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 8 Feb 2016 10:49:47 +0000 (11:49 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate Potlatch 2 to 2.4-21-g233799c build
Tom Hughes [Sun, 7 Feb 2016 14:32:03 +0000 (14:32 +0000)]
Update Potlatch 2 to 2.4-21-g233799c build

8 years agoFix new rubocop warnings
Tom Hughes [Fri, 5 Feb 2016 12:28:16 +0000 (12:28 +0000)]
Fix new rubocop warnings

8 years agoUpdate bundle
Tom Hughes [Fri, 5 Feb 2016 12:20:40 +0000 (12:20 +0000)]
Update bundle

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 1 Feb 2016 08:31:31 +0000 (09:31 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 28 Jan 2016 15:52:17 +0000 (16:52 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 27 Jan 2016 09:35:36 +0000 (10:35 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to tails 4.2.5.1
Tom Hughes [Mon, 25 Jan 2016 21:26:54 +0000 (21:26 +0000)]
Update to tails 4.2.5.1

8 years agoValidate characters in changeset comments
Tom Hughes [Tue, 19 Jan 2016 00:20:27 +0000 (00:20 +0000)]
Validate characters in changeset comments

Fixes #1135
Closes #1139

8 years agoFix rubocop warnings
Tom Hughes [Tue, 19 Jan 2016 00:19:09 +0000 (00:19 +0000)]
Fix rubocop warnings

8 years agoUpdate bundle
Tom Hughes [Tue, 19 Jan 2016 00:10:31 +0000 (00:10 +0000)]
Update bundle

8 years agoUpdate to iD v1.8.5
Bryan Housel [Mon, 18 Jan 2016 15:38:19 +0000 (10:38 -0500)]
Update to iD v1.8.5

8 years agoUse ruby 2.1.8 on travis
Nik Nyby [Wed, 13 Jan 2016 01:51:51 +0000 (20:51 -0500)]
Use ruby 2.1.8 on travis

8 years agoAdd routing URLs to example config
Tom Hughes [Mon, 11 Jan 2016 19:11:50 +0000 (19:11 +0000)]
Add routing URLs to example config

8 years agoMove routing API endpoint addresses to config file
Tom Hughes [Mon, 11 Jan 2016 19:03:47 +0000 (19:03 +0000)]
Move routing API endpoint addresses to config file

8 years agoPrecompile login.js
Tom Hughes [Sun, 10 Jan 2016 10:14:58 +0000 (10:14 +0000)]
Precompile login.js

Fixes #1128

8 years agoAdd some tests for the locale library
Tom Hughes [Thu, 7 Jan 2016 18:41:34 +0000 (18:41 +0000)]
Add some tests for the locale library

8 years agoDiscard and locale tags that fail to parse
Tom Hughes [Thu, 7 Jan 2016 09:10:19 +0000 (09:10 +0000)]
Discard and locale tags that fail to parse

8 years agoUpdate to iD v1.8.4
Bryan Housel [Wed, 6 Jan 2016 22:51:49 +0000 (17:51 -0500)]
Update to iD v1.8.4

8 years agoRework locale selection
Tom Hughes [Wed, 6 Jan 2016 18:43:25 +0000 (18:43 +0000)]
Rework locale selection

Implement our own matching algorithm rather than trying to
patch the http_accept_language one and make sure everything is
using it in a consistent way.

Fixes #1125

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1117'
Tom Hughes [Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1117'

8 years agoAdd ImageMagick to list of packages to install
Victor Grousset [Wed, 30 Dec 2015 17:17:05 +0000 (18:17 +0100)]
Add ImageMagick to list of packages to install

8 years agoIt's a magnifying glass, stupid...
Simon Poole [Mon, 28 Dec 2015 14:34:38 +0000 (15:34 +0100)]
It's a magnifying glass, stupid...

8 years agoAdd Host: to robots.txt
Grant Slater [Sat, 26 Dec 2015 23:53:59 +0000 (23:53 +0000)]
Add Host: to robots.txt

8 years agoUpdate rss.rss.builder
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.

8 years agoFix deprecation warnings in migrations
Tom Hughes [Mon, 21 Dec 2015 16:11:02 +0000 (16:11 +0000)]
Fix deprecation warnings in migrations

8 years agoAdd rel=nofollow to links to tagless nodes in browse pages
Tom Hughes [Sun, 20 Dec 2015 00:19:16 +0000 (00:19 +0000)]
Add rel=nofollow to links to tagless nodes in browse pages

8 years agoUpdate Potlatch 2 to 2.4-16-g0c126d0 build
Tom Hughes [Wed, 16 Dec 2015 16:21:09 +0000 (16:21 +0000)]
Update Potlatch 2 to 2.4-16-g0c126d0 build

8 years agoPreserve URL fragments through external authentication
Tom Hughes [Sat, 12 Dec 2015 16:08:09 +0000 (16:08 +0000)]
Preserve URL fragments through external authentication

Fixes #1102

8 years agoRemove inline javascript from login page
Tom Hughes [Sat, 12 Dec 2015 11:42:36 +0000 (11:42 +0000)]
Remove inline javascript from login page

8 years agoUpdate to iD v1.8.3
Bryan Housel [Fri, 11 Dec 2015 21:28:26 +0000 (13:28 -0800)]
Update to iD v1.8.3

8 years agoRemove test for iD and Internet Explorer
Bryan Housel [Fri, 11 Dec 2015 02:48:22 +0000 (18:48 -0800)]
Remove test for iD and Internet Explorer

8 years agoSupport using iD on Internet Explorer 11 and above
Bryan Housel [Fri, 11 Dec 2015 02:34:18 +0000 (18:34 -0800)]
Support using iD on Internet Explorer 11 and above

8 years agoUpdate to iD v1.8.2
Bryan Housel [Fri, 11 Dec 2015 02:02:52 +0000 (18:02 -0800)]
Update to iD v1.8.2

8 years agoUpdate documentation to say ruby 2.0 is required
Tom Hughes [Thu, 10 Dec 2015 09:50:34 +0000 (09:50 +0000)]
Update documentation to say ruby 2.0 is required

8 years agoRemove 9.0 extension install instructions
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.

8 years agoEnable https for humanitarian layer
Tom Hughes [Mon, 7 Dec 2015 15:59:13 +0000 (15:59 +0000)]
Enable https for humanitarian layer

8 years agoUse correct title in og:title for pages with no title
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

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1099'
Tom Hughes [Mon, 7 Dec 2015 14:57:19 +0000 (14:57 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1099'

8 years agoUse ruby 2.1.7 for travis
Tom Hughes [Mon, 7 Dec 2015 14:31:55 +0000 (14:31 +0000)]
Use ruby 2.1.7 for travis

8 years agoFacebook emails are verified
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.

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1082'
Tom Hughes [Mon, 7 Dec 2015 14:21:57 +0000 (14:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1082'

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1085'
Tom Hughes [Mon, 7 Dec 2015 14:11:35 +0000 (14:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1085'

8 years agoFix issues with bogus % encoded sequences in URLs
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

8 years agoAllow closing the sidebar when a timeout occured
Florian Schäfer [Sat, 5 Dec 2015 20:59:27 +0000 (21:59 +0100)]
Allow closing the sidebar when a timeout occured

8 years agoFix display of raw HTML in flash message
Tom Hughes [Mon, 30 Nov 2015 08:56:26 +0000 (08:56 +0000)]
Fix display of raw HTML in flash message

Fixes #1095

9 years agoDon't update urlhash while in intro
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.

9 years agoSwitch back to the upsteam image_optim
Tom Hughes [Sat, 21 Nov 2015 16:21:30 +0000 (16:21 +0000)]
Switch back to the upsteam image_optim

9 years agoUpdate to rails 4.2.5
Tom Hughes [Thu, 19 Nov 2015 21:37:05 +0000 (21:37 +0000)]
Update to rails 4.2.5

9 years agoFix rubocop warnings
Tom Hughes [Thu, 19 Nov 2015 21:35:48 +0000 (21:35 +0000)]
Fix rubocop warnings

9 years agoUpdate image_optim and disable cleanupIDs plugin
Tom Hughes [Thu, 19 Nov 2015 21:29:23 +0000 (21:29 +0000)]
Update image_optim and disable cleanupIDs plugin

9 years agoHide .describe_location on push and popstate
Aditya Prakash [Fri, 13 Nov 2015 04:11:47 +0000 (09:41 +0530)]
Hide .describe_location on push and popstate

9 years agoIcon for shop=car_parts added
Edward17 [Sun, 8 Nov 2015 20:55:57 +0000 (21:55 +0100)]
Icon for shop=car_parts added

9 years agoUpdate to iD v1.8.0
Bryan Housel [Sun, 8 Nov 2015 04:18:03 +0000 (23:18 -0500)]
Update to iD v1.8.0

9 years agoPass title to opengraph routine
Tom Hughes [Thu, 5 Nov 2015 11:44:08 +0000 (11:44 +0000)]
Pass title to opengraph routine

9 years agoUpdate key and data browser for new road colours
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.

9 years agoDon't send note comment notifications to deleted users
Tom Hughes [Fri, 30 Oct 2015 19:11:25 +0000 (19:11 +0000)]
Don't send note comment notifications to deleted users

9 years agoDon't send changeset 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

9 years agoAdd og:description to OpenGraph tags
Tom Hughes [Tue, 27 Oct 2015 11:57:40 +0000 (11:57 +0000)]
Add og:description to OpenGraph tags

9 years agoAdd og:url to OpenGraph tags
Tom Hughes [Tue, 27 Oct 2015 11:52:40 +0000 (11:52 +0000)]
Add og:url to OpenGraph tags

9 years agoUse PNG logo for og:image
Tom Hughes [Tue, 27 Oct 2015 11:49:06 +0000 (11:49 +0000)]
Use PNG logo for og:image

9 years agoAdd more detail to OpenGraph tags
Tom Hughes [Mon, 26 Oct 2015 22:27:00 +0000 (22:27 +0000)]
Add more detail to OpenGraph tags

Closes #1073

9 years agoMerge remote-tracking branch 'openstreetmap/pull/1078'
Tom Hughes [Mon, 26 Oct 2015 15:51:59 +0000 (15:51 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1078'

9 years agoUpdate leaflet to 0.7.7
Tom Hughes [Mon, 26 Oct 2015 15:45:32 +0000 (15:45 +0000)]
Update leaflet to 0.7.7

9 years agoRemove inline property of secondary links on diary page
Aditya Prakash [Mon, 26 Oct 2015 07:03:57 +0000 (12:33 +0530)]
Remove inline property of secondary links on diary page

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 22 Oct 2015 09:37:14 +0000 (11:37 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 14 Oct 2015 11:00:07 +0000 (13:00 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoUser ferry icon for kFerryEnter with Mapzen routing
Tom Hughes [Mon, 12 Oct 2015 20:17:57 +0000 (21:17 +0100)]
User ferry icon for kFerryEnter with Mapzen routing

9 years agoMerge remote-tracking branch 'openstreetmap/pull/1068'
Tom Hughes [Mon, 12 Oct 2015 20:15:47 +0000 (21:15 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1068'

9 years agoAdd ferry routing information for OSRM
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).

9 years agoClose html <source> tags
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.

9 years agoSwitch back to the upstream omniauth-google-oauth2 gem
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.

9 years agoImprove error handling for routing engines
Tom Hughes [Wed, 30 Sep 2015 20:56:57 +0000 (21:56 +0100)]
Improve error handling for routing engines

9 years agoMake travis copy example.application.yml to application.yml
Tom Hughes [Wed, 30 Sep 2015 18:56:02 +0000 (19:56 +0100)]
Make travis copy example.application.yml to application.yml

9 years agoEnsure assets are recompiled when configuration changes
Tom Hughes [Wed, 30 Sep 2015 18:34:14 +0000 (19:34 +0100)]
Ensure assets are recompiled when configuration changes

9 years agoScale total distance to metres for Mapzen
Tom Hughes [Wed, 30 Sep 2015 16:22:27 +0000 (17:22 +0100)]
Scale total distance to metres for Mapzen

9 years agoAdd support for Mapzen's Valhalla routing engine
Tom Hughes [Tue, 29 Sep 2015 14:37:04 +0000 (15:37 +0100)]
Add support for Mapzen's Valhalla routing engine

9 years agoFix jshint warning
Tom Hughes [Mon, 28 Sep 2015 14:01:41 +0000 (15:01 +0100)]
Fix jshint warning

9 years agoUse jsonp for MapQuest as CORS doesn't seem to be working
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

9 years agoAllow jQuery to construct the routing URLs
Tom Hughes [Mon, 28 Sep 2015 13:43:12 +0000 (14:43 +0100)]
Allow jQuery to construct the routing URLs

9 years agoMake MapQuest API key conditional
Tom Hughes [Mon, 28 Sep 2015 12:54:49 +0000 (13:54 +0100)]
Make MapQuest API key conditional