Commit graph

8167 commits

Author SHA1 Message Date
Andy Allan
effb1b7f41 Merge branch 'master' into moderation 2017-11-29 12:18:39 +00:00
translatewiki.net
8f1676b71a Localisation updates from https://translatewiki.net. 2017-11-27 08:12:19 +01:00
Tom Hughes
986779966b Extend form-action policies for Chrome
It seems that unlike other browsers Chrome requires that if a form
submission redirects that the redirected URL also match the form-action
policy rather than just requiring the original URL to match.
2017-11-25 12:04:02 +00:00
Tom Hughes
a3519348c6 Remove inline javascript from user settings page 2017-11-24 16:20:50 +00:00
Tom Hughes
afa5d420d3 Allow iD to fetch gpx files from arbitrary locations 2017-11-24 08:38:51 +00:00
Tom Hughes
527ec293c2 Fix security policy for mapillary in iD 2017-11-24 01:09:27 +00:00
Tom Hughes
6a1a4a3f7d Fix remote editing security policy 2017-11-24 00:46:27 +00:00
Tom Hughes
2cd81daf34 Add security policy for remote control editing 2017-11-24 00:43:14 +00:00
Tom Hughes
4950ae3c1f Allow iD to connect to nominatim 2017-11-24 00:10:38 +00:00
Tom Hughes
bb116b85df Allow third party images in user content 2017-11-23 22:39:05 +00:00
Tom Hughes
3c4774a5f7 Allow images to be loaded from piwik 2017-11-23 22:22:01 +00:00
Tom Hughes
a2c7c09f7c Merge remote-tracking branch 'upstream/pull/1687' 2017-11-23 13:24:47 +00:00
Andy Allan
4954e9815b Update CONTRIBUTING to remove reference to cruise and use link to Travis 2017-11-23 11:31:15 +00:00
translatewiki.net
874957f54e Localisation updates from https://translatewiki.net. 2017-11-23 07:48:25 +01:00
Andy Allan
50dce49d1f Add the OpenStreetMap Blog to the list of community links
Although the content is currently duplicated into the blog aggregator,
it's still worth having an explicit link, and making it the first one,
since it contains entries of more significant interest to the community.
2017-11-22 15:51:32 +00:00
Andy Allan
1b181d4c1d Put specific page titles at the start
The makes the shortened titles commonly shown on browser tabs more
useful.
2017-11-22 14:57:26 +00:00
Andy Allan
cb87f02642 Merge branch 'pull/843' into titles 2017-11-22 14:42:16 +00:00
Andy Allan
15b104f4ff Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p
Refs #139
2017-11-22 10:47:18 +00:00
translatewiki.net
6e612d953a Localisation updates from https://translatewiki.net. 2017-11-20 09:29:08 +01:00
Tom Hughes
e813a31d7a Make context menu use from/to for directions
This ensures that the router will try to geocode the values rather
than assuming that they are latitude/longitude pairs.

Fixes #1684
2017-11-19 19:49:39 +00:00
Tom Hughes
7ce94ad0ec Add openstreetcam.org to security policy for iD 2017-11-16 10:17:22 +00:00
Tom Hughes
38efb6c957 Merge remote-tracking branch 'upstream/pull/1682' 2017-11-16 10:17:06 +00:00
translatewiki.net
67c5c36482 Localisation updates from https://translatewiki.net. 2017-11-16 11:10:07 +01:00
Bryan Housel
2c0588dba1 Update to iD v2.5.1 2017-11-16 00:50:21 -05:00
Tom Hughes
d581fbfaf1 Make system tests run by default 2017-11-15 19:14:31 +00:00
Tom Hughes
9e929de530 Add framework for system tests 2017-11-15 19:14:31 +00:00
Andy Allan
aa1fb6dbb8 Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into pnorman-wheres_this
Fixes #412
2017-11-15 18:25:51 +00:00
translatewiki.net
181ed81c8e Localisation updates from https://translatewiki.net. 2017-11-13 09:26:31 +01:00
Bryan Housel
2168c2867c Add iD disable_features parameter 2017-11-10 15:57:37 -05:00
Bryan Housel
c3df2a5180 Update to iD v2.5.0 2017-11-10 15:55:11 -05:00
Simon Poole
0cf41126ff
Remove link to wiki legal FAQ as confusing and unmaintained 2017-11-10 11:13:03 +01:00
Tom Hughes
5846e39a36 Disable keyboard controls for layer switcher maps
Fixes #1673
2017-11-09 14:29:17 +00:00
Tom Hughes
00a51bff99 Merge remote-tracking branch 'upstream/pull/1668' 2017-11-09 09:45:17 +00:00
translatewiki.net
554ff7824a Localisation updates from https://translatewiki.net. 2017-11-09 08:24:10 +01:00
translatewiki.net
d7f72f3dc6 Localisation updates from https://translatewiki.net. 2017-11-06 09:17:04 +01:00
Tom Hughes
7346c5a024 Update site to use jQuery 3 2017-11-03 20:40:48 +00:00
Drew Dara-Abrams
96a00910d5 When no cache store is set use cookie storage for sessions
A change in the default configuration of development environments
in rails 5.1 means that caching is now disabled by default so in
that case fall back to using cookies instead.

Closes #1666
2017-11-02 19:19:03 +00:00
translatewiki.net
236869eb73 Localisation updates from https://translatewiki.net. 2017-11-02 08:26:40 +01:00
JamesKingdom
065564621b
Change wording for hosting partners 2017-11-01 20:39:36 +00:00
Tom Hughes
18d3392ede Relax cookie security policy 2017-11-01 17:48:35 +00:00
translatewiki.net
2f7072b82d Localisation updates from https://translatewiki.net. 2017-10-30 09:19:18 +01:00
Tom Hughes
b6b9d543ac Fix rubocop warnings 2017-10-29 19:43:02 +00:00
Tom Hughes
51be94a25d Update bundle 2017-10-29 19:35:26 +00:00
Tom Hughes
b2fa947502 Replace factory_girl with factory_bot 2017-10-29 19:29:30 +00:00
Tom Hughes
1c77d2432e Avoid using rinku's auto_link helper
It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.
2017-10-27 19:45:32 +01:00
Tom Hughes
cea455d390 Update for ActionView::Template::Error change 2017-10-27 19:25:49 +01:00
translatewiki.net
bda06347db Localisation updates from https://translatewiki.net. 2017-10-27 05:06:42 +02:00
Tom Hughes
fff5a755d3 Convert session timeout to seconds when it is set
This avoids problems if the rails Duration class changes
representation between different versions of rails.
2017-10-25 08:59:29 +01:00
Tom Hughes
38640e0253 Merge remote-tracking branch 'upstream/pull/1652' 2017-10-25 08:16:33 +01:00
Tom Hughes
f0b2ed9bb6 Merge remote-tracking branch 'upstream/pull/1659' 2017-10-24 20:19:46 +01:00