Commit graph

6914 commits

Author SHA1 Message Date
Matt Amos
cf6a5c17ee 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.
2015-06-13 10:59:57 +01:00
Tom Hughes
891ec3d75c More favicon tweaks 2015-06-11 22:25:26 +01:00
Tom Hughes
edfbbf7336 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.
2015-06-11 21:18:31 +01:00
Bryan Housel
92384ed956 Update to iD v1.7.3 2015-06-10 11:53:10 -04:00
Tom Hughes
e07890a2ad Remove bogus mock data from facebook and windowslive tests 2015-06-08 16:27:04 +01:00
Tom Hughes
957d75295b Fix warnings from rubocop update 2015-06-08 15:59:17 +01:00
Tom Hughes
726c149bd5 Update bundle 2015-06-08 15:51:14 +01:00
Siebrand Mazeland
ca123fb281 Localisation updates from https://translatewiki.net. 2015-06-08 16:22:48 +02:00
Tom Hughes
a3b2555046 Fix typo... 2015-05-31 15:40:36 +01:00
Tom Hughes
01f41aabb1 Improve vagrant configuration
Use official ubuntu/trusty64 image for virtualbox, and NFS sharing
for lxc and libvirt.
2015-05-31 15:37:27 +01:00
Tom Hughes
0546ebb7b0 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.
2015-05-31 14:55:32 +01:00
Tom Hughes
835eff6346 Only apply data browser CSS rules in the data browser 2015-05-26 17:43:07 +01:00
Siebrand Mazeland
18d5cf1957 Localisation updates from https://translatewiki.net. 2015-05-25 13:07:02 +02:00
Tom Hughes
2b2264ddab Add support for Windows Live authentication 2015-05-19 14:04:09 +01:00
Tom Hughes
c9893e186b Add support for Facebook authentication 2015-05-19 14:04:08 +01:00
Simon Poole
a1f73967a9 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.
2015-05-19 13:57:39 +01:00
Siebrand Mazeland
9d9c13c433 Localisation updates from https://translatewiki.net. 2015-05-16 19:08:25 +02:00
Tom Hughes
ca213b873f 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
2015-05-15 15:34:12 +01:00
Simon Poole
8c37f47244 Add IRC and switch2osm to help page, slight language improvement 2015-05-15 11:24:35 +01:00
Tom Hughes
b40353b9b0 Escape fragment identifiers in wikipedia URLs
Fixes #967
2015-05-14 20:34:25 +01:00
nebulon42
b2784c4d2d add browse symbols of openstreetmap-carto 2.30.0 2015-05-14 20:03:48 +02:00
Tom Hughes
b4caac4d49 Improve handling of HTTP errors in search
Fixes #969
2015-05-14 09:21:19 +01:00
Tom Hughes
14d4b9206c Fix vagrant to install all thee 3GL functions 2015-05-07 23:13:07 +01:00
Simon Poole
5552ae3de2 Add "Legal" paragraph on the "About" page 2015-05-05 17:59:01 +01:00
Simon Poole
dcaefd0d6f Add links to the Beginners' guide, mailing lists and forums to the help page
From a pure design and content view (where the content is factual) a link
to learnosm.org would really be better. Potentially learnosm could be forked
and a version hosted on OSMF infrastructure with the marketing verbiage
for HOTs view of the world removed.
2015-05-05 17:56:38 +01:00
Simon Poole
fe77d0daa1 Document the fact that OSMF is the licensor
Add links to the relevant OSMF sites and text indicating that
the OSMF is the licensor.
2015-05-05 17:55:18 +01:00
Siebrand Mazeland
4e496b1c18 Localisation updates from https://translatewiki.net. 2015-05-04 11:08:02 +02:00
Bryan Housel
2ac8b4b760 Update to iD v1.7.2 2015-05-03 10:30:14 -04:00
Bryan Housel
f36fc22e1a Update to iD v1.7.1 2015-04-30 14:42:10 -04:00
Tom Hughes
283d04a117 Ignore coverage data 2015-04-28 19:01:54 +01:00
Tom Hughes
570863392a Update bundle 2015-04-28 18:57:13 +01:00
Siebrand Mazeland
6b3ab915c8 Localisation updates from https://translatewiki.net. 2015-04-23 14:39:00 +02:00
nebulon42
a33b85d29f update browse symbols changed in osm-carto 2.29.0 2015-04-17 23:13:36 +02:00
Tom Hughes
b0ed606173 Avoid using Time.parse as it is affected by the TZ variable 2015-04-16 15:46:47 +01:00
Tom Hughes
dd4e766788 Redirect to the login page if auth failure has no origin 2015-04-16 11:16:18 +01:00
Tom Hughes
2111ace158 Prefer username/password to openid_url if both are set 2015-04-16 11:14:57 +01:00
Tom Hughes
ddaf43bc0e Add tests for Google OAuth authentication 2015-04-14 10:08:07 +01:00
Tom Hughes
eeb9866d50 Add support for Google OAuth2 authentication
This replaces OpenID authentication, which is going away soon, but
provides an upgrade path where we can migrate users that already have
a Google OpenID setup to the new system transparently.
2015-04-14 10:08:07 +01:00
Tom Hughes
7ed50894e2 Load user_blocks fixtures for login test 2015-04-14 10:07:38 +01:00
Tom Hughes
2af0840ff3 Fix style issues found by new rubocop version 2015-04-14 09:38:24 +01:00
Tom Hughes
52d7cae438 Update bundle 2015-04-14 09:22:44 +01:00
Štefan Baebler
080b12330b Added information about sources for Slovenia 2015-04-07 22:26:52 +01:00
Štefan Baebler
2c33236cb1 Updated wiki link data
Fixes #943
2015-04-07 22:20:34 +01:00
Tom Hughes
650adc10b2 Allow space as a language separator
The separator is supposed to be comma, so technically having
space instead is user error, but it seems to be very common.

Fixes #942
2015-03-31 20:53:51 +01:00
Tom Hughes
8ad2f4b5c8 Send OpenID logging to rails log 2015-03-31 14:31:51 +01:00
Tom Hughes
fc57778d61 Configure CA path for OpenID 2015-03-31 14:03:10 +01:00
Tom Hughes
5bb11f892a Update travis configuration for apt addoon changes 2015-03-31 00:13:16 +01:00
Tom Hughes
a31591bdc3 Drop memory limit support
The soft limit won't work with passenger 5 and causes spurious
errors to be reported back to browsers, and in any case it doesn't
actually seem to be necessary anymore.
2015-03-30 21:32:36 +01:00
Tom Hughes
b78241de68 Remove workaround for fixed bug in passenger 2015-03-30 21:28:29 +01:00
Tom Hughes
65bbf6b626 Move ruby-progressbar back to 1.7.1 for now 2015-03-23 08:36:19 +00:00