]> git.openstreetmap.org Git - rails.git/log
rails.git
9 years agoUse image_optim to optimize SVG assets with svgo
Tom Hughes [Sun, 13 Sep 2015 09:48:33 +0000 (10:48 +0100)]
Use image_optim to optimize SVG assets with svgo

9 years agoUpdate bundle
Tom Hughes [Sun, 13 Sep 2015 08:53:01 +0000 (09:53 +0100)]
Update bundle

9 years agoFix interpolation errors
Tom Hughes [Thu, 10 Sep 2015 09:11:39 +0000 (10:11 +0100)]
Fix interpolation errors

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 10 Sep 2015 08:38:58 +0000 (10:38 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoUpdate to Leaflet 0.7.5
Tom Hughes [Wed, 2 Sep 2015 18:05:24 +0000 (19:05 +0100)]
Update to Leaflet 0.7.5

9 years agoUpdate to Leaflet 0.7.4
Tom Hughes [Tue, 1 Sep 2015 18:08:44 +0000 (19:08 +0100)]
Update to Leaflet 0.7.4

9 years agoUpdate test for changes in #903
Tom Hughes [Thu, 27 Aug 2015 20:55:48 +0000 (21:55 +0100)]
Update test for changes in #903

9 years agoMerge remote-tracking branch 'openstreetmap/pull/891'
Tom Hughes [Thu, 27 Aug 2015 20:46:56 +0000 (21:46 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/891'

9 years agoMerge remote-tracking branch 'openstreetmap/pull/903'
Tom Hughes [Thu, 27 Aug 2015 20:44:44 +0000 (21:44 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/903'

9 years agoMerge remote-tracking branch 'openstreetmap/pull/1040'
Tom Hughes [Thu, 27 Aug 2015 20:30:50 +0000 (21:30 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1040'

9 years agoMerge remote-tracking branch 'openstreetmap/pull/1045'
Tom Hughes [Thu, 27 Aug 2015 20:21:45 +0000 (21:21 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1045'

9 years agoMerge remote-tracking branch 'openstreetmap/pull/1043'
Tom Hughes [Thu, 27 Aug 2015 20:18:05 +0000 (21:18 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1043'

9 years agoMark some flash messages as html safe
Tom Hughes [Thu, 27 Aug 2015 19:43:50 +0000 (20:43 +0100)]
Mark some flash messages as html safe

9 years agoDisplay number of comments in changeset list
Simon Legner [Thu, 27 Aug 2015 18:50:05 +0000 (20:50 +0200)]
Display number of comments in changeset list

9 years agoClose layers panel on double-clicking a layer
Simon Legner [Wed, 26 Aug 2015 21:31:36 +0000 (23:31 +0200)]
Close layers panel on double-clicking a layer

Relates to #465.

9 years agoDirections, read "to" location in URL - fixes #998
Simon Legner [Wed, 26 Aug 2015 19:38:39 +0000 (21:38 +0200)]
Directions, read "to" location in URL - fixes #998

9 years agoNotes: show first comment as marker tooltip
Simon Legner [Tue, 14 Apr 2015 21:32:58 +0000 (23:32 +0200)]
Notes: show first comment as marker tooltip

9 years agoUpdate to rails 4.2.4
Tom Hughes [Mon, 24 Aug 2015 21:32:00 +0000 (22:32 +0100)]
Update to rails 4.2.4

9 years agoDon't treat flash messages as raw
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

9 years agoTest rendering of OAuth authorization page
Tom Hughes [Wed, 19 Aug 2015 07:35:41 +0000 (08:35 +0100)]
Test rendering of OAuth authorization page

9 years agoAdd missing parenthesis
Tom Hughes [Wed, 19 Aug 2015 07:22:00 +0000 (08:22 +0100)]
Add missing parenthesis

Fixes #1037

9 years agoFix new rubocopy warnings
Tom Hughes [Tue, 18 Aug 2015 19:57:14 +0000 (20:57 +0100)]
Fix new rubocopy warnings

9 years agoUpdate bundle
Tom Hughes [Tue, 18 Aug 2015 19:19:36 +0000 (20:19 +0100)]
Update bundle

9 years agoMake button on OAuth authorization screen translatable
Tom Hughes [Tue, 18 Aug 2015 18:19:35 +0000 (19:19 +0100)]
Make button on OAuth authorization screen translatable

Fixes #1025

9 years agoFix double XML declaration on trace RSS feeds
Tom Hughes [Tue, 18 Aug 2015 18:09:11 +0000 (19:09 +0100)]
Fix double XML declaration on trace RSS feeds

Fixes #1034

9 years agoadded missing wording for note "not found" and "timeout"
Holger Jeromin [Tue, 18 Aug 2015 08:31:29 +0000 (10:31 +0200)]
added missing wording for note "not found" and "timeout"

9 years agoApply a timeout to most changeset API calls
Tom Hughes [Fri, 14 Aug 2015 18:55:11 +0000 (19:55 +0100)]
Apply a timeout to most changeset API calls

9 years agoUpdate jquery.cookie
Tom Hughes [Thu, 13 Aug 2015 16:00:44 +0000 (17:00 +0100)]
Update jquery.cookie

9 years agoUpdate leaflet polyline plugin
Tom Hughes [Thu, 13 Aug 2015 15:59:27 +0000 (16:59 +0100)]
Update leaflet polyline plugin

9 years agoUpdate html5shiv to 3.7.3
Tom Hughes [Thu, 13 Aug 2015 15:56:07 +0000 (16:56 +0100)]
Update html5shiv to 3.7.3

9 years agoEnable https for thunderforest layers
Tom Hughes [Thu, 13 Aug 2015 15:55:37 +0000 (16:55 +0100)]
Enable https for thunderforest layers

9 years agoDon't show hidden notes to non-moderators in the user notes list
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

9 years agoHide hidden notes and comments correctly in the data browser
Tom Hughes [Wed, 12 Aug 2015 16:20:30 +0000 (17:20 +0100)]
Hide hidden notes and comments correctly in the data browser

9 years agoAdd tests for new note GPX elements
Tom Hughes [Mon, 10 Aug 2015 18:19:23 +0000 (19:19 +0100)]
Add tests for new note GPX elements

9 years agoMake notes GPX valid and add useful official 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.

9 years agoSimplify new-note marker placement - always in the centre
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.)

9 years agoValidate page numbers in URLs
Tom Hughes [Tue, 28 Jul 2015 23:39:09 +0000 (00:39 +0100)]
Validate page numbers in URLs

9 years agoRevert e04cab86 and add explicit small screen rules for overlay sidebar
Tom Hughes [Tue, 28 Jul 2015 18:17:02 +0000 (19:17 +0100)]
Revert e04cab86 and add explicit small screen rules for overlay sidebar

9 years agoAllow customer URL schemas for OAuth callback URLs
Tom Hughes [Tue, 28 Jul 2015 11:13:18 +0000 (12:13 +0100)]
Allow customer URL schemas for OAuth callback URLs

Fixes #1019

9 years agoError if geocoder#search is called with no arguments
Tom Hughes [Sun, 26 Jul 2015 21:58:41 +0000 (22:58 +0100)]
Error if geocoder#search is called with no arguments

9 years agoremove completely outdated entries from map key for default layer
Mateusz Konieczny [Sun, 26 Jul 2015 11:04:07 +0000 (13:04 +0200)]
remove completely outdated entries from map key for default layer

9 years agoRemove height specification for sidebar in small screen mode
Tom Hughes [Sat, 25 Jul 2015 11:49:53 +0000 (12:49 +0100)]
Remove height specification for sidebar in small screen mode

9 years agoFix small screen CSS rules that match on a body class
Tom Hughes [Thu, 23 Jul 2015 17:35:49 +0000 (18:35 +0100)]
Fix small screen CSS rules that match on a body class

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 23 Jul 2015 17:06:03 +0000 (19:06 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoFix a missing translation
Tom Hughes [Thu, 23 Jul 2015 13:23:23 +0000 (14:23 +0100)]
Fix a missing translation

9 years agoRaise an exception for missing translations in test mode
Tom Hughes [Thu, 23 Jul 2015 13:23:01 +0000 (14:23 +0100)]
Raise an exception for missing translations in test mode

9 years agoUse correct translation for new notes in RSS feed
Tom Hughes [Thu, 23 Jul 2015 12:50:28 +0000 (13:50 +0100)]
Use correct translation for new notes in RSS feed

9 years agoMake switch to compact and small modes dynamic
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

9 years agoAdd missing ::before to archaeological_site CSS rule
Tom Hughes [Wed, 22 Jul 2015 10:56:15 +0000 (11:56 +0100)]
Add missing ::before to archaeological_site CSS rule

Fixes #1013

9 years agoRequire a valid session token to resend a confirmation
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

9 years agoTemporary fix to avoid showing emails
Tom Hughes [Mon, 20 Jul 2015 14:07:18 +0000 (15:07 +0100)]
Temporary fix to avoid showing emails

9 years agoAdd support for generating logstash friendly logs
Tom Hughes [Sun, 19 Jul 2015 18:24:20 +0000 (19:24 +0100)]
Add support for generating logstash friendly logs

9 years agoUpdate bundle
Tom Hughes [Sun, 19 Jul 2015 18:17:35 +0000 (19:17 +0100)]
Update bundle

9 years agoUse correct URL for problem report control
Tom Hughes [Fri, 17 Jul 2015 21:36:57 +0000 (22:36 +0100)]
Use correct URL for problem report control

9 years agoSimplify "report a problem" 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.

9 years agoAdd report a problem link to attribution, code nicked from osm.ch
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

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Tue, 14 Jul 2015 14:26:58 +0000 (16:26 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoRemove donation drive banner
Tom Hughes [Sat, 11 Jul 2015 10:40:14 +0000 (11:40 +0100)]
Remove donation drive banner

Fixes #1003

9 years agoChange direction string ids to force retranslation
Tom Hughes [Wed, 8 Jul 2015 19:37:56 +0000 (20:37 +0100)]
Change direction string ids to force retranslation

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 8 Jul 2015 06:28:32 +0000 (08:28 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoUpdate Potlatch 2 to 2.4-4-g37a0924 build
Tom Hughes [Sun, 5 Jul 2015 12:17:24 +0000 (13:17 +0100)]
Update Potlatch 2 to 2.4-4-g37a0924 build

9 years agoImprove formatting of OSRM directions
Tom Hughes [Wed, 1 Jul 2015 20:03:54 +0000 (21:03 +0100)]
Improve formatting of OSRM directions

Fixes #904

9 years agoChange donation drive panel to a thank you
Tom Hughes [Tue, 30 Jun 2015 20:59:14 +0000 (21:59 +0100)]
Change donation drive panel to a thank you

Closes #1001

9 years agoUse a fixed name for the asset manifest
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.

9 years agoUpdate mailmap
Tom Hughes [Sat, 27 Jun 2015 23:14:07 +0000 (00:14 +0100)]
Update mailmap

9 years agoAdd browse symbols for openstreetmap-carto 2.31.0
Michael Glanznig [Sat, 27 Jun 2015 20:17:26 +0000 (22:17 +0200)]
Add browse symbols for openstreetmap-carto 2.31.0

9 years agoUpdate to rails 4.2.3
Tom Hughes [Fri, 26 Jun 2015 18:33:39 +0000 (19:33 +0100)]
Update to rails 4.2.3

9 years agoAdd a Geo URI link to the share panel
Eric Theise [Thu, 25 Jun 2015 16:55:41 +0000 (17:55 +0100)]
Add a Geo URI link to the share panel

Fixes #799

9 years agoImprove display of user block timestamps
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

9 years agotypofix (bupported -> supported)
tilmanb [Thu, 25 Jun 2015 08:07:29 +0000 (10:07 +0200)]
typofix (bupported -> supported)

9 years agoAdd HTML version of friend notification email
Tom Hughes [Wed, 24 Jun 2015 23:12:12 +0000 (00:12 +0100)]
Add HTML version of friend notification email

Fixes #995

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 22 Jun 2015 09:59:23 +0000 (11:59 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 18 Jun 2015 11:39:44 +0000 (13:39 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoUpdate to rails 4.2.2
Tom Hughes [Tue, 16 Jun 2015 19:20:09 +0000 (20:20 +0100)]
Update to rails 4.2.2

9 years agoUpdate to latest upstream i18n-js
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.

9 years agoAdd a paragraph on the rules in OSM or the lack of them
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

9 years agoAdd advert for donation drive
Tom Hughes [Tue, 16 Jun 2015 09:18:01 +0000 (10:18 +0100)]
Add advert for donation drive

9 years agoRemove unused images
Tom Hughes [Tue, 16 Jun 2015 09:37:11 +0000 (10:37 +0100)]
Remove unused images

9 years agoFix bug allowing created elements to reference deleted ones
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.

9 years agoMore favicon tweaks
Tom Hughes [Thu, 11 Jun 2015 21:25:26 +0000 (22:25 +0100)]
More favicon tweaks

9 years agoImprove favicons
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.

9 years agoUpdate to iD v1.7.3
Bryan Housel [Wed, 10 Jun 2015 15:53:10 +0000 (11:53 -0400)]
Update to iD v1.7.3

9 years agoRemove bogus mock data from facebook and windowslive tests
Tom Hughes [Mon, 8 Jun 2015 15:27:04 +0000 (16:27 +0100)]
Remove bogus mock data from facebook and windowslive tests

9 years agoFix warnings from rubocop update
Tom Hughes [Mon, 8 Jun 2015 14:58:43 +0000 (15:58 +0100)]
Fix warnings from rubocop update

9 years agoUpdate bundle
Tom Hughes [Mon, 8 Jun 2015 14:51:14 +0000 (15:51 +0100)]
Update bundle

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 8 Jun 2015 14:22:48 +0000 (16:22 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoFix typo...
Tom Hughes [Sun, 31 May 2015 14:40:36 +0000 (15:40 +0100)]
Fix typo...

9 years agoImprove vagrant configuration
Tom Hughes [Sun, 31 May 2015 14:35:32 +0000 (15:35 +0100)]
Improve vagrant configuration

Use official ubuntu/trusty64 image for virtualbox, and NFS sharing
for lxc and libvirt.

9 years agoUpgrade vagrant config to use Ubuntu 14.04
Tom Hughes [Sun, 31 May 2015 13:53:02 +0000 (14:53 +0100)]
Upgrade vagrant config to use Ubuntu 14.04

This uses the sputnik13/trusty64 image rather then the official
ubuntu/trusty64 image in order to get libvirt provider support as
wall as virtualbox provider support.

9 years agoOnly apply data browser CSS rules in the data browser
Tom Hughes [Tue, 26 May 2015 16:43:07 +0000 (17:43 +0100)]
Only apply data browser CSS rules in the data browser

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 25 May 2015 11:07:02 +0000 (13:07 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoAdd support for Windows Live authentication
Tom Hughes [Mon, 27 Apr 2015 21:52:42 +0000 (22:52 +0100)]
Add support for Windows Live authentication

9 years agoAdd support for Facebook authentication
Tom Hughes [Mon, 27 Apr 2015 20:39:54 +0000 (21:39 +0100)]
Add support for Facebook authentication

9 years agoAdd trademark information to copyright page
Simon Poole [Tue, 19 May 2015 12:53:18 +0000 (13:53 +0100)]
Add trademark information to copyright page

Added some minimal text to the copyright page wrt trademarks, currently
pointing to the LWG, one day it should refer to a formal policy.

9 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 16 May 2015 17:08:25 +0000 (19:08 +0200)]
Localisation updates from https://translatewiki.net.

9 years agoMore improvements to mediawiki fragment escaping
Tom Hughes [Fri, 15 May 2015 14:34:12 +0000 (15:34 +0100)]
More improvements to mediawiki fragment escaping

It turns out that the PHP urlencode encodes more characters than
the ruby URI.encode does by default, so specify our own characters
to encode based on http://php.net/manual/en/function.urlencode.php
with the extra exclusion of colon, which the mediawiki code reverses
after the encoding is done.

Fixes #967

9 years agoAdd IRC and switch2osm to help page, slight language improvement
Simon Poole [Fri, 15 May 2015 10:14:57 +0000 (12:14 +0200)]
Add IRC and switch2osm to help page, slight language improvement

9 years agoEscape fragment identifiers in wikipedia URLs
Tom Hughes [Thu, 14 May 2015 19:34:25 +0000 (20:34 +0100)]
Escape fragment identifiers in wikipedia URLs

Fixes #967

9 years agoadd browse symbols of openstreetmap-carto 2.30.0
nebulon42 [Thu, 14 May 2015 18:03:48 +0000 (20:03 +0200)]
add browse symbols of openstreetmap-carto 2.30.0

9 years agoImprove handling of HTTP errors in search
Tom Hughes [Thu, 14 May 2015 08:21:19 +0000 (09:21 +0100)]
Improve handling of HTTP errors in search

Fixes #969