cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6947 commits 4 branches 1 tag 499 MiB
Commit graph

6947 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
619db2e89c Raise an exception for missing translations in test mode 2015-07-23 14:23:01 +01:00
Tom Hughes
6886a149b2 Use correct translation for new notes in RSS feed 2015-07-23 13:50:28 +01:00
Tom Hughes
4dceacdeba 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
 2015-07-22 22:48:22 +01:00
Tom Hughes
e68b5db140 Add missing ::before to archaeological_site CSS rule 
Fixes #1013
 2015-07-22 11:56:33 +01:00
Tom Hughes
629ae62b73 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
 2015-07-20 21:32:34 +01:00
Tom Hughes
9fdea1c739 Temporary fix to avoid showing emails 2015-07-20 15:07:18 +01:00
Tom Hughes
82cefb5929 Add support for generating logstash friendly logs 2015-07-19 19:24:20 +01:00
Tom Hughes
29e364d585 Update bundle 2015-07-19 19:17:35 +01:00
Tom Hughes
67e77fd20e Use correct URL for problem report control 2015-07-17 22:36:57 +01:00
Tom Hughes
899891fe8a Simplify "report a problem" control 
Defer to the standard attribution control methods as much as
possible instead of duplicating them.
 2015-07-17 22:19:49 +01:00
Simon Poole
6ede8ca045 Add report a problem link to attribution, code nicked from osm.ch 2015-07-17 21:21:12 +01:00
Siebrand Mazeland
3de1163a2f Localisation updates from https://translatewiki.net. 2015-07-14 16:26:58 +02:00
Tom Hughes
996d5413d8 Remove donation drive banner 
Fixes #1003
 2015-07-11 11:40:14 +01:00
Tom Hughes
d28ae2ad0a Change direction string ids to force retranslation 2015-07-08 20:38:28 +01:00
Siebrand Mazeland
b5b9f9972b Localisation updates from https://translatewiki.net. 2015-07-08 08:28:32 +02:00
Tom Hughes
674aef0d3f Update Potlatch 2 to 2.4-4-g37a0924 build 2015-07-05 13:17:24 +01:00
Tom Hughes
1729a680ac Improve formatting of OSRM directions 
Fixes #904
 2015-07-01 21:03:54 +01:00
Tom Hughes
9e2db4513e Change donation drive panel to a thank you 
Closes #1001
 2015-06-30 22:01:44 +01:00
Tom Hughes
84170254e4 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.
 2015-06-28 10:35:44 +01:00
Tom Hughes
785bf2bfe1 Update mailmap 2015-06-28 00:14:07 +01:00
Michael Glanznig
601f1609ab Add browse symbols for openstreetmap-carto 2.31.0 2015-06-28 00:11:34 +01:00
Tom Hughes
c4cb8286ba Update to rails 4.2.3 2015-06-26 22:57:27 +01:00
Eric Theise
6403cb9b08 Add a Geo URI link to the share panel 
Fixes #799
 2015-06-25 17:56:03 +01:00
Tom Hughes
4676179879 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
 2015-06-25 17:44:20 +01:00
tilmanb
0678ab6067 typofix (bupported -> supported) 2015-06-25 10:07:29 +02:00
Tom Hughes
a22c3525e4 Add HTML version of friend notification email 
Fixes #995
 2015-06-25 00:16:15 +01:00
Siebrand Mazeland
12e22c5de3 Localisation updates from https://translatewiki.net. 2015-06-22 11:59:23 +02:00
Siebrand Mazeland
4ee63e118d Localisation updates from https://translatewiki.net. 2015-06-18 13:39:44 +02:00
Tom Hughes
fa4bc2e623 Update to rails 4.2.2 2015-06-16 20:20:37 +01:00
Tom Hughes
445e608bae 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.
 2015-06-16 19:17:37 +01:00
Simon Poole
cf8a20962b Add a paragraph on the rules in OSM or the lack of them 2015-06-16 18:41:43 +01:00
Tom Hughes
876d5614da Add advert for donation drive 2015-06-16 10:38:29 +01:00
Tom Hughes
e2eb8c9186 Remove unused images 2015-06-16 10:37:11 +01:00
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