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

7122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
bb489ed5a3 Merge remote-tracking branch 'openstreetmap/pull/1174' 2016-03-09 18:40:41 +00:00
Tom Hughes
f94340b9e8 Fix tests that made assumptions about tag ordering 2016-03-09 13:47:05 +00:00
Siebrand Mazeland
f10ad9128c Localisation updates from https://translatewiki.net. 2016-03-09 13:44:53 +01:00
Simon Legner
6c3fd1e053 Consistent blue marker colour for sharing location 
Before, when adding a marker, it was coloured blue. After sharing the marker,
it was coloured red.
 2016-03-08 23:59:55 +01:00
Tom Hughes
b7bea9c6b3 Use rake test:db to do initial test run 
This makes sure the database is initialised by loading the schema
dumped after migrating the development database.

Fixes #878
Closes #1173
 2016-03-08 14:23:43 +00:00
Tom Hughes
fe04a0c486 Update to rails 4.2.6 2016-03-07 22:38:40 +00:00
Tom Hughes
37d65124a6 Improve styling of "signup blocked" page 2016-03-07 12:20:55 +00:00
Tom Hughes
6e154d48c0 Ignore bounds on elements with geometry 2016-03-06 21:37:47 +00:00
Tom Hughes
0ff7a928e4 Fix query tool to get correct bounds for enclosing ways 
The bounding box returned by overpass for geom output is only
the bounds for the clipped geometry, so fetch the geometry and
the bounding box separately and merge them client side.

Fixes #1156
 2016-03-06 20:42:04 +00:00
Tom Hughes
9f9ba18baa Correct URL of Mapzen metro extracts 2016-03-04 20:28:07 +00:00
Tom Hughes
0cbc6833ed Compile traffico font assets 2016-03-04 16:47:36 +00:00
Tom Hughes
cf597c1984 Remove debug statement 2016-03-04 10:30:16 +00:00
Tom Hughes
397b68af32 Only compile those iD assets that we actually need 2016-03-04 10:29:58 +00:00
Tom Hughes
fea08ef39b Merge remote-tracking branch 'openstreetmap/pull/1172' into next 2016-03-03 22:25:58 +00:00
Bryan Housel
2059c8346c Update to iD v1.9.1 2016-03-03 16:28:53 -05:00
Bryan Housel
47881add28 Add traffico icons to vendor/assets/iD and asset pipeline precompile list 2016-03-03 16:27:40 -05:00
Niklas Laxström
bbd40f9f5e Localisation updates from https://translatewiki.net. 2016-03-03 08:29:44 +01:00
Bryan Housel
2d7a678772 Update to iD v1.9.0 2016-03-01 17:19:05 -05:00
Tom Hughes
95bf36e158 Update rails to 4.2.5.2 2016-02-29 22:23:08 +00:00
Niklas Laxström
3ca254d6f1 Localisation updates from https://translatewiki.net. 2016-02-29 17:24:23 +01:00
Tom Hughes
398b4484ff Change "blocks received" to "active blocks" 
Fixes #1168
 2016-02-29 14:26:50 +00:00
Tom Hughes
fa593d8865 Make capitalisation of user menu entries consistent 2016-02-29 14:26:20 +00:00
Tom Hughes
f0fa701563 Treeat user as logged in after a password reset 
Fixes #1160
 2016-02-26 16:30:32 +00:00
Tom Hughes
480c17be58 Preserve username and "remember me" when login fails 
Fixes #1159
 2016-02-26 15:32:40 +00:00
Niklas Laxström
0fe1780e4d Localisation updates from https://translatewiki.net. 2016-02-25 09:24:08 +01:00
Niklas Laxström
ec64ea8aa3 Localisation updates from https://translatewiki.net. 2016-02-22 08:48:32 +01:00
Siebrand Mazeland
f0219a08d7 Localisation updates from https://translatewiki.net. 2016-02-19 15:23:26 +01:00
Tom Hughes
3238bf567c Merge remote-tracking branch 'openstreetmap/pull/1154' 2016-02-15 21:09:59 +00:00
Aditya Prakash
80c46f54d4 Create new translation string for deleted user 2016-02-15 22:37:54 +05:30
Aditya Prakash
341f6cd9fe Do not hyperlink profiles of deleted users 2016-02-15 20:47:53 +05:30
Niklas Laxström
5bf5819fa8 Localisation updates from https://translatewiki.net. 2016-02-15 07:18:10 +01:00
Tom Hughes
be624d64f3 Avoid using Rails.application.assets as it no longer set in production 2016-02-11 10:15:19 +00:00
Tom Hughes
8008dc9ccb Update rubocopy config after bug fixes 2016-02-11 07:12:41 +00:00
Tom Hughes
b2f2188e9d Remove sprockets-rails version restriction now konacha is fixed 2016-02-11 07:10:42 +00:00
Niklas Laxström
4a9a08ae8a Localisation updates from https://translatewiki.net. 2016-02-11 07:36:36 +01:00
Niklas Laxström
afde083378 Localisation updates from https://translatewiki.net. 2016-02-08 11:49:47 +01:00
Tom Hughes
fd0d21dea0 Update Potlatch 2 to 2.4-21-g233799c build 2016-02-07 14:32:03 +00:00
Tom Hughes
5d3ecffa28 Fix new rubocop warnings 2016-02-05 13:35:26 +00:00
Tom Hughes
c7061991e7 Update bundle 2016-02-05 12:20:40 +00:00
Niklas Laxström
7df0fee347 Localisation updates from https://translatewiki.net. 2016-02-01 09:31:31 +01:00
Siebrand Mazeland
2f08f064b2 Localisation updates from https://translatewiki.net. 2016-01-28 16:52:17 +01:00
Siebrand Mazeland
14f1777dad Localisation updates from https://translatewiki.net. 2016-01-27 10:35:36 +01:00
Tom Hughes
e4acc41d28 Update to tails 4.2.5.1 2016-01-25 21:26:54 +00:00
Tom Hughes
77c25dca8c Validate characters in changeset comments 
Fixes #1135
Closes #1139
 2016-01-19 09:51:24 +00:00
Tom Hughes
8fe1899596 Fix rubocop warnings 2016-01-19 09:51:24 +00:00
Tom Hughes
2ef6a960d1 Update bundle 2016-01-19 09:51:23 +00:00
Bryan Housel
cb43e6af9e Update to iD v1.8.5 2016-01-18 10:38:19 -05:00
Nik Nyby
17d166b20f Use ruby 2.1.8 on travis 2016-01-13 14:45:37 +00:00
Tom Hughes
7d53513769 Add routing URLs to example config 2016-01-11 19:11:50 +00:00
Tom Hughes
e128e78408 Move routing API endpoint addresses to config file 2016-01-11 19:03:47 +00:00