Tom Hughes
6ec02bcdb2
Merge remote-tracking branch 'upstream/pull/2440'
2019-11-20 19:01:13 +00:00
Tom Hughes
abf35dd756
Merge remote-tracking branch 'upstream/pull/2441'
2019-11-20 18:57:50 +00:00
Tom Hughes
f1905095ed
Merge remote-tracking branch 'upstream/pull/2439'
2019-11-20 18:56:42 +00:00
Andy Allan
8ad88b9ddc
Move user preference XML generation to a view
2019-11-20 16:39:23 +01:00
Andy Allan
25ebf87e5a
Rename UserPreference controller methods to follow rails conventions more closely
2019-11-20 16:09:48 +01:00
Andy Allan
bc850d1d37
Move Relation.to_xml and to_xml_node out of the model and into tests
2019-11-20 15:45:28 +01:00
Andy Allan
2b1bac1279
Move Way.to_xml and to_xml_node out of the model and into tests
...
This code is only used in the tests. Refs #2433
2019-11-20 15:31:47 +01:00
Andy Allan
56d9b8a4ce
Remove the users.nearby column
...
Refs #2417 and #2432
2019-11-20 15:07:42 +01:00
Tom Hughes
6852bc9c92
Update bundle
...
Closes #2438
2019-11-20 00:03:36 +00:00
translatewiki.net
ad04bd57f2
Localisation updates from https://translatewiki.net .
2019-11-18 18:23:07 +01:00
Tom Hughes
893e6fe689
Update bundle
2019-11-14 19:11:45 +00:00
translatewiki.net
6a77bbe544
Localisation updates from https://translatewiki.net .
2019-11-14 17:28:11 +01:00
Tom Hughes
efcb56b68b
Merge remote-tracking branch 'upstream/pull/2433'
2019-11-14 12:24:50 +00:00
Tom Hughes
38b464a238
Merge remote-tracking branch 'upstream/pull/2432'
2019-11-14 12:20:10 +00:00
Andy Allan
4e7c0c3008
Move Node.to_xml and to_xml_node out of model and into tests
...
This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.
2019-11-13 17:01:40 +01:00
Andy Allan
ae5c364e97
Move the format tests to test the output from the controller
2019-11-13 15:21:41 +01:00
Andy Allan
dd294f89b8
Ignore the users.nearby column
...
This is the first step of removing the column, see #2417 . It needs to be
deployed before a migration to remove it, since the columns are
cached in ActiveRecord and things break if objects exist in memory
that expect the column to be there.
2019-11-13 14:19:32 +01:00
translatewiki.net
80238df3ca
Localisation updates from https://translatewiki.net .
2019-11-11 17:06:16 +01:00
Tom Hughes
551e4295c0
Merge remote-tracking branch 'upstream/pull/2429'
2019-11-10 09:50:48 +00:00
Tom Hughes
e0f0cbdb06
Merge remote-tracking branch 'upstream/pull/2428'
2019-11-10 09:50:28 +00:00
Chris Gadd
9e64fe73e2
Update hut icons
2019-11-10 14:53:51 +13:00
Enock Seth Nyamador
3a847419c0
fixed typo
2019-11-09 23:39:58 +00:00
Enock Seth Nyamador
fef9c8938f
add SOTM Africa 2019 banner
2019-11-09 23:37:30 +00:00
Tom Hughes
816ee8ec92
Merge remote-tracking branch 'upstream/pull/834'
2019-11-07 19:26:03 +00:00
translatewiki.net
47f4e8b728
Localisation updates from https://translatewiki.net .
2019-11-07 16:22:42 +01:00
Tom Hughes
2842e8e264
Update bundle
2019-11-05 18:55:32 +00:00
translatewiki.net
48d5d0730b
Localisation updates from https://translatewiki.net .
2019-11-04 16:03:09 +01:00
Tom Hughes
34dd2293db
Merge remote-tracking branch 'upstream/pull/2422'
2019-11-01 09:13:39 +00:00
Andy Allan
69621b46ff
Remove outdated reference to the external gpx importer
2019-11-01 09:39:04 +01:00
translatewiki.net
672677c7f0
Localisation updates from https://translatewiki.net .
2019-10-31 18:46:19 +01:00
Tom Hughes
90e2a144dc
Merge remote-tracking branch 'upstream/pull/2412'
2019-10-30 19:20:30 +00:00
Tom Hughes
5977c47851
Merge remote-tracking branch 'upstream/pull/2418'
2019-10-30 19:20:11 +00:00
Tom Hughes
d711d5af73
Merge remote-tracking branch 'upstream/pull/2416'
2019-10-30 19:20:08 +00:00
Tom Hughes
db7e6022cb
Update bundle
2019-10-30 19:16:03 +00:00
Andy Allan
57c73a25bd
Add description of the nominatim key update process
...
Fixes #2119
2019-10-30 15:44:43 +01:00
Andy Allan
7410b59a50
Remove unused trace_optionals partial
...
Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.
2019-10-30 15:02:35 +01:00
translatewiki.net
54d805da33
Localisation updates from https://translatewiki.net .
2019-10-28 16:38:58 +01:00
Tom Hughes
4b2d6436ce
Merge remote-tracking branch 'upstream/pull/2413'
2019-10-27 18:59:35 +00:00
translatewiki.net
4035c790f8
Localisation updates from https://translatewiki.net .
2019-10-24 22:14:22 +02:00
Bryan Housel
0f3309291e
Update to iD v2.16.0
2019-10-24 00:03:40 -04:00
Tom Hughes
56798e9435
Merge remote-tracking branch 'upstream/pull/2403'
2019-10-23 18:48:17 +01:00
Tom Hughes
8ddd02a2a1
Merge remote-tracking branch 'upstream/pull/2411'
2019-10-23 10:55:02 +01:00
Andy Allan
15865b5a8d
Remove node/way/relation Search API
...
This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.
It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.
2019-10-23 11:41:05 +02:00
Andy Allan
fb709531ba
Convert various moderator? tests to use cancancan permissions checks
2019-10-23 11:26:16 +02:00
Andy Allan
60ecfde65c
Convert various administator? tests to use cancancan permissions checks
2019-10-23 10:52:12 +02:00
Andy Allan
edd49e8582
Remove references to libpgosm during travis runs
...
These were removed from the structure file in 098e73479b
2019-10-23 09:33:05 +02:00
Tom Hughes
8072a82f1d
Exclude node_modules form eslint checks
2019-10-22 20:37:39 +01:00
Tom Hughes
58e95f7ea4
Merge remote-tracking branch 'upstream/pull/2354'
2019-10-22 20:33:45 +01:00
Tom Hughes
18c5e16225
Merge remote-tracking branch 'upstream/pull/2408'
2019-10-22 20:29:00 +01:00
Tom Hughes
30accae458
Update to sprockets 4.x
2019-10-22 20:20:43 +01:00
