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

8346 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
647a3a7d39 Merge remote-tracking branch 'upstream/pull/1658' 2017-10-24 19:41:46 +01:00
translatewiki.net
fe602bd25b Localisation updates from https://translatewiki.net. 2017-10-23 05:15:48 +02:00
Andy Allan
4d406fcdfd Rubocop fixes 2017-10-22 22:35:34 +01:00
Andy Allan
b2a8df0bd7 Add annotate gem and associated rake task. Annotate models. 2017-10-22 22:18:26 +01:00
Andy Allan
d581f17665 Avoid using or comparing explicit model ids 
The code is easier to read using higher-level concepts.
 2017-10-22 21:58:09 +01:00
translatewiki.net
44b817a6d5 Localisation updates from https://translatewiki.net. 2017-10-19 09:17:15 +02:00
Holger Jeromin
2a21c82185 Removes DOM difference in location button (main map) 2017-10-18 19:51:05 +02:00
Holger Jeromin
833579778a Removes DOM difference in location button 2017-10-18 15:05:11 +02:00
Tom Hughes
29a780eb1a Add rails version number to migrations 2017-10-17 18:49:55 +01:00
Tom Hughes
f773f67958 Update to rails 5.1.4 2017-10-17 18:49:55 +01:00
Tom Hughes
4b91dc4228 Merge remote-tracking branch 'upstream/pull/1651' 2017-10-16 19:08:37 +01:00
Tom Hughes
87918595da Merge remote-tracking branch 'upstream/pull/1580' 2017-10-16 19:08:32 +01:00
translatewiki.net
3ddcd5b6d0 Localisation updates from https://translatewiki.net. 2017-10-16 10:49:29 +02:00
Bryan Housel
a938b2a17e Add banner for OSMF Membership Drive 2017-10-16 01:07:07 -04:00
translatewiki.net
49c78c3d6f Localisation updates from https://translatewiki.net. 2017-10-12 08:51:51 +02:00
Bryan Housel
a3a22c2ec2 Update to iD v2.4.3 2017-10-09 18:08:24 -04:00
Tom Hughes
f02c753cc4 Use send_data for GPX traces intead of monkey patching send_file 2017-10-09 20:38:08 +01:00
Tom Hughes
8379b65174 Improve user_image_url test 
Use a user that actually has an image and updated the expect
output to match that.
 2017-10-09 19:10:32 +01:00
Tom Hughes
0b0ff1bcc5 Remove reference to large screen stylesheet 
The separate large screen stylesheet was removed in 4dceacdeb but
we are still referencing it on Internet Explorer.
 2017-10-09 13:47:48 +01:00
Tom Hughes
6e0ca57e2f Fix typo that means fe0f4543c1 has never worked 2017-10-09 08:39:14 +01:00
Bryan Housel
07c0462000 Update to iD v2.4.2 2017-10-09 08:23:59 +01:00