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

8038 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
translatewiki.net
b87327ac3a Localisation updates from https://translatewiki.net. 2017-10-09 08:41:47 +02:00
Tom Hughes
e16311125e Use Hash#dig to simplify code 2017-10-05 20:22:24 +01:00
Tom Hughes
e057175ca9 Repair bundle 2017-10-05 19:31:52 +01:00
Tom Hughes
8dae890a76 Fix rubocop warnings 2017-10-05 19:18:38 +01:00
Tom Hughes
4f20850e55 Update bundle 2017-10-05 08:32:51 +01:00
Niklas Laxström
cd649ad6dd Localisation updates from https://translatewiki.net. 2017-10-05 08:02:25 +02:00
Tom Hughes
6209a9be78 Drop geocoder.us from search engines 
Fixes #1633
 2017-09-25 22:52:03 +01:00
Ian Dees
429641bd90 Add banner-sotmus2017.png 2017-09-14 14:43:22 -05:00
Ian Dees
a19a7f2bae Delete banner-sotm-2017.png 2017-09-14 14:42:05 -05:00
Ian Dees
2e34dd715e Add SOTM US and remove SOTM.org 2017-09-14 14:39:47 -05:00
Tom Hughes
47d33ed98e Defer measuring of header elements to a timeout 
Chrome 60 and later seem to fire the "ready" callback before the DOM is
fully ready causing us to measure the wrong sizes for the header elements
so we use a 0ms timeout to defer the measurement slightly as a workaround.

Fixes #1639
 2017-09-14 20:30:38 +01:00
Kshitiz Khanal
715759211a Add banner for State of the Map Asia 2017 
Closes #1630
 2017-09-08 16:54:39 +01:00
Wille Marcel
a402e811da Add padding between the last diary post and the pagination links 
Closes #1634
 2017-09-08 16:50:09 +01:00
Tom Hughes
e7e85db0c8 Update secure_headers configuration for upstream changes 2017-09-08 16:49:28 +01:00
Tom Hughes
448bdb2454 Update travis configuration to work on trusty based builders 
Switch to postgres 9.5 and link postgres functions to a directory
that is accessible to the postgres server.
 2017-09-08 16:33:26 +01:00
Tom Hughes
d3a876f13a Update rails to 5.0.6 2017-09-08 15:27:14 +01:00
Tom Hughes
f1faffd4d1 Merge remote-tracking branch 'upstream/pull/1614' 2017-08-30 21:09:32 +01:00
Andy Allan
b4be5596f5 Rename xml processing methods with an update_ prefix 
They behave differently from the other from_xml methods on other models.
 2017-08-30 11:40:54 +01:00
Tom Hughes
33845759ac Enable retina tiles for Thunderforest layers 
Fixes #1623
 2017-08-29 20:28:39 +01:00
Bryan Housel
c7545691bb Update to iD v2.4.1 2017-08-26 16:08:43 -04:00
Bryan Housel
8d2acb8ef0 Add iD hashtags parameter 2017-08-25 16:24:19 -04:00
Bryan Housel
366a9e9097 Update to iD v2.4.0 2017-08-25 16:21:11 -04:00
Andy Allan
c647aa3d4d Refactor the from_xml methods to act on existing trace objects. 
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.

Fixes #1600
 2017-08-18 10:09:50 +01:00
Andy Allan
e9324ad681 Add failing test demonstrating tag duplication when updating traces via the API. 2017-08-17 19:03:50 +01:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
mmd-osm
7fd1e55938 Discard empty ways from query result geometries 
Fixes #1608
 2017-08-10 19:49:50 +01:00
Tom Hughes
ff7244d085 Update to leaflet 1.2.0 2017-08-09 22:48:56 +01:00
Tom Hughes
9ed1fe2d78 Fix rubocop warning 2017-08-03 19:08:54 +01:00
Tom Hughes
c7377c7f9f Switch to using openstreetmap-deadlock_retry 
Closes #1602
 2017-08-03 18:41:45 +01:00
Tom Hughes
e2367194b7 Merge remote-tracking branch 'upstream/pull/1604' 2017-08-02 15:38:21 +01:00
Andy Allan
efab85fe67 Add maintainers to README 
It's nice to be explicit, so that new contributers know who is who.

While github shows "owner" and "member" labels these are for the
openstreetmap organisation as a whole, and can be misleading.
 2017-08-02 15:34:17 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed 
Fixes #1601
 2017-08-02 15:32:13 +01:00
Andy Allan
60f2074bac Merge pull request #1588 from Georeactor/master 
Update gem, fix icons on RTL/Arabic pages
 2017-08-02 15:15:25 +01:00
Tom Hughes
bc10bc8758 Merge remote-tracking branch 'upstream/pull/1603' 2017-08-02 15:02:39 +01:00
Andy Allan
389095df1c Remove unused user save template. 
This template isn't used, since all the controller methods redirect
to other views.
 2017-08-02 14:48:04 +01:00
Tom Hughes
f258af223b Fix user settings form 
Fixes #1601
 2017-08-01 19:25:07 +01:00
Tom Hughes
72fb2062b5 Update to rails 5.0.5 2017-07-31 21:55:40 +01:00
Tom Hughes
4bd49a8cd7 Update bundle 2017-07-31 21:55:32 +01:00