]>
git.openstreetmap.org Git - rails.git/log
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
Tom Hughes [Thu, 13 Aug 2015 16:00:44 +0000 (17:00 +0100)]
Update jquery.cookie
Tom Hughes [Thu, 13 Aug 2015 15:59:27 +0000 (16:59 +0100)]
Update leaflet polyline plugin
Tom Hughes [Thu, 13 Aug 2015 15:56:07 +0000 (16:56 +0100)]
Update html5shiv to 3.7.3
Tom Hughes [Thu, 13 Aug 2015 15:55:37 +0000 (16:55 +0100)]
Enable https for thunderforest layers
Tom Hughes [Wed, 12 Aug 2015 16:42:14 +0000 (17:42 +0100)]
Don't show hidden notes to non-moderators in the user notes list
Fixes #921
Tom Hughes [Wed, 12 Aug 2015 16:20:30 +0000 (17:20 +0100)]
Hide hidden notes and comments correctly in the data browser
Tom Hughes [Mon, 10 Aug 2015 18:19:23 +0000 (19:19 +0100)]
Add tests for new note GPX elements
Markus Heidelberg [Mon, 10 Aug 2015 18:07:23 +0000 (19:07 +0100)]
Make notes GPX valid and add useful official elements
The "creator" attribute is required and "extensions" is the correct
name of this element.
Validated with SAXCount from the xerces-c package:
$ SAXCount -v=always -n -s -f notes.gpx
Original error messages:
Error at file /home/markus/notes.gpx, line 2, char 171
Message: no declaration found for element 'gpx'
Error at file /home/markus/notes.gpx, line 2, char 171
Message: attribute 'version' is not declared for element 'gpx'
After adding the "xmlns" attribute:
Error at file /home/markus/notes.gpx, line 2, char 213
Message: missing required attribute 'creator'
Error at file /home/markus/notes.gpx, line 18, char 14
Message: no declaration found for element 'extension'
Error at file /home/markus/notes.gpx, line 26, char 7
Message: element 'extension' is not allowed for content model '(ele?,time?,magvar?,geoidheight?,name?,cmt?,desc?,src?,link*,sym?,type?,fix?,sat?,hdop?,vdop?,pdop?,ageofdgpsdata?,dgpsid?,extensions?)'
The current errors now are caused by the missing XML schema for the
extensions.
Also add the time, name and link elements.
Dan Stowell [Sun, 9 Aug 2015 09:56:22 +0000 (10:56 +0100)]
Simplify new-note marker placement - always in the centre
(This removes a tweak added in
40b3c82 , which we believe is
no longer relevant now the new-note dialogue is sidebar
rather than bubble.)
Tom Hughes [Tue, 28 Jul 2015 23:39:09 +0000 (00:39 +0100)]
Validate page numbers in URLs
Tom Hughes [Tue, 28 Jul 2015 18:17:02 +0000 (19:17 +0100)]
Revert
e04cab86 and add explicit small screen rules for overlay sidebar
Tom Hughes [Tue, 28 Jul 2015 11:13:18 +0000 (12:13 +0100)]
Allow customer URL schemas for OAuth callback URLs
Fixes #1019
Tom Hughes [Sun, 26 Jul 2015 21:58:41 +0000 (22:58 +0100)]
Error if geocoder#search is called with no arguments
Mateusz Konieczny [Sun, 26 Jul 2015 11:04:07 +0000 (13:04 +0200)]
remove completely outdated entries from map key for default layer
Tom Hughes [Sat, 25 Jul 2015 11:49:53 +0000 (12:49 +0100)]
Remove height specification for sidebar in small screen mode
Tom Hughes [Thu, 23 Jul 2015 17:35:49 +0000 (18:35 +0100)]
Fix small screen CSS rules that match on a body class
Siebrand Mazeland [Thu, 23 Jul 2015 17:06:03 +0000 (19:06 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 23 Jul 2015 13:23:23 +0000 (14:23 +0100)]
Fix a missing translation
Tom Hughes [Thu, 23 Jul 2015 13:23:01 +0000 (14:23 +0100)]
Raise an exception for missing translations in test mode
Tom Hughes [Thu, 23 Jul 2015 12:50:28 +0000 (13:50 +0100)]
Use correct translation for new notes in RSS feed
Tom Hughes [Wed, 22 Jul 2015 18:02:31 +0000 (19:02 +0100)]
Make switch to compact and small modes dynamic
The point where we need to switch between normal mode, compact mode
and small mode varies due to different string lengths in different
languages, but that can't be expressed by a media query, so use some
javascript to update as the window size changes.
Fixes #1014
Tom Hughes [Wed, 22 Jul 2015 10:56:15 +0000 (11:56 +0100)]
Add missing ::before to archaeological_site CSS rule
Fixes #1013
Tom Hughes [Mon, 20 Jul 2015 20:32:34 +0000 (21:32 +0100)]
Require a valid session token to resend a confirmation
Make user#confirm_resend require a valid token in the session
that matches the requested user, and ensure trying to login as
an unconfirmed user sets such a token.
Fixes #1010
Tom Hughes [Mon, 20 Jul 2015 14:07:18 +0000 (15:07 +0100)]
Temporary fix to avoid showing emails
Tom Hughes [Sun, 19 Jul 2015 18:24:20 +0000 (19:24 +0100)]
Add support for generating logstash friendly logs
Tom Hughes [Sun, 19 Jul 2015 18:17:35 +0000 (19:17 +0100)]
Update bundle
Tom Hughes [Fri, 17 Jul 2015 21:36:57 +0000 (22:36 +0100)]
Use correct URL for problem report control
Tom Hughes [Fri, 17 Jul 2015 21:19:49 +0000 (22:19 +0100)]
Simplify "report a problem" control
Defer to the standard attribution control methods as much as
possible instead of duplicating them.
Simon Poole [Sun, 18 May 2014 11:35:52 +0000 (13:35 +0200)]
Add report a problem link to attribution, code nicked from osm.ch
Siebrand Mazeland [Tue, 14 Jul 2015 14:26:58 +0000 (16:26 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 11 Jul 2015 10:40:14 +0000 (11:40 +0100)]
Remove donation drive banner
Fixes #1003
Tom Hughes [Wed, 8 Jul 2015 19:37:56 +0000 (20:37 +0100)]
Change direction string ids to force retranslation
Siebrand Mazeland [Wed, 8 Jul 2015 06:28:32 +0000 (08:28 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 5 Jul 2015 12:17:24 +0000 (13:17 +0100)]
Update Potlatch 2 to
2.4-4-g37a0924 build
Tom Hughes [Wed, 1 Jul 2015 20:03:54 +0000 (21:03 +0100)]
Improve formatting of OSRM directions
Fixes #904
Tom Hughes [Tue, 30 Jun 2015 20:59:14 +0000 (21:59 +0100)]
Change donation drive panel to a thank you
Closes #1001
Tom Hughes [Sun, 28 Jun 2015 09:35:44 +0000 (10:35 +0100)]
Use a fixed name for the asset manifest
Because we deploy by updating an existing environment the default
sprockets strategy gives us multiple randomly named manifest files
and it will then pick one arbitrarily when starting up.
Tom Hughes [Sat, 27 Jun 2015 23:14:07 +0000 (00:14 +0100)]
Update mailmap
Michael Glanznig [Sat, 27 Jun 2015 20:17:26 +0000 (22:17 +0200)]
Add browse symbols for openstreetmap-carto 2.31.0
Tom Hughes [Fri, 26 Jun 2015 18:33:39 +0000 (19:33 +0100)]
Update to rails 4.2.3
Eric Theise [Thu, 25 Jun 2015 16:55:41 +0000 (17:55 +0100)]
Add a Geo URI link to the share panel
Fixes #799
Tom Hughes [Thu, 25 Jun 2015 16:44:20 +0000 (17:44 +0100)]
Improve display of user block timestamps
Display the creation time, as a friendly date with a tooltip for
the exact time, and add a tooltip to the expiry time.
Fixes #923 and #996
tilmanb [Thu, 25 Jun 2015 08:07:29 +0000 (10:07 +0200)]
typofix (bupported -> supported)
Tom Hughes [Wed, 24 Jun 2015 23:12:12 +0000 (00:12 +0100)]
Add HTML version of friend notification email
Fixes #995
Siebrand Mazeland [Mon, 22 Jun 2015 09:59:23 +0000 (11:59 +0200)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 18 Jun 2015 11:39:44 +0000 (13:39 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 16 Jun 2015 19:20:09 +0000 (20:20 +0100)]
Update to rails 4.2.2
Tom Hughes [Tue, 16 Jun 2015 18:17:37 +0000 (19:17 +0100)]
Update to latest upstream i18n-js
The issues we had before seem to be fixed now, so drop our
custom version and go back to the upstream one with some minor
monkey patching tweaks.
This also fixes the sprockets dependencies to correctly rebuild
the javascript when the translations change.
Simon Poole [Tue, 16 Jun 2015 17:36:18 +0000 (18:36 +0100)]
Add a paragraph on the rules in OSM or the lack of them
Tom Hughes [Tue, 16 Jun 2015 09:18:01 +0000 (10:18 +0100)]
Add advert for donation drive
Tom Hughes [Tue, 16 Jun 2015 09:37:11 +0000 (10:37 +0100)]
Remove unused images
Matt Amos [Sat, 13 Jun 2015 09:59:11 +0000 (10:59 +0100)]
Fix bug allowing created elements to reference deleted ones
The bug allows a newly-created element to refer to a deleted one
if the transactions for both overlap. Precisely, the issue is that
the check that an element exists does not prevent a concurrent
transaction from altering that row.
Because "deleting" an element in the OSM database does not remove
the row, we cannot rely on FK constraints to ensure the correct
behaviour. Instead, this fix relies on manually locking referenced
elements.
Note that this "fix" is suboptimal, as it does not allow any
updates to the referenced elements. Updates which do not delete
the row could safely be done, but will be prevented.
Also, it's not clear what the negative performance impact of this
change will be.
Tom Hughes [Thu, 11 Jun 2015 21:25:26 +0000 (22:25 +0100)]
More favicon tweaks
Tom Hughes [Thu, 11 Jun 2015 20:16:29 +0000 (21:16 +0100)]
Improve favicons
Following http://stackoverflow.com/questions/
2268204 /favicon-dimensions
advice on the best range of icons to offer, and using the site linked
there to generate everything.
Bryan Housel [Wed, 10 Jun 2015 15:53:10 +0000 (11:53 -0400)]
Update to iD v1.7.3
Tom Hughes [Mon, 8 Jun 2015 15:27:04 +0000 (16:27 +0100)]
Remove bogus mock data from facebook and windowslive tests
Tom Hughes [Mon, 8 Jun 2015 14:58:43 +0000 (15:58 +0100)]
Fix warnings from rubocop update