Tom Hughes
e1cac818b1
Merge remote-tracking branch 'openstreetmap/pull/1416'
2017-01-26 17:51:13 +00:00
Tom Hughes
ba092de0ac
Load user fixtures for ChangesetComment model tests
2017-01-26 17:50:11 +00:00
Niklas Laxström
552ae3bcb5
Localisation updates from https://translatewiki.net .
2017-01-26 11:16:34 +01:00
Andy Allan
7b0b09a527
Remove unused user_tokens fixture and pointless test.
2017-01-25 16:43:04 +00:00
Tom Hughes
5bcf82d865
Update to leaflet 1.0.3
2017-01-23 12:30:11 +00:00
Niklas Laxström
c4488a0e54
Localisation updates from https://translatewiki.net .
2017-01-23 13:15:00 +01:00
Tom Hughes
c985c2d4ce
Update Potlatch 2 to 2.4-32-gecf1e0b build
2017-01-19 15:03:56 +00:00
Niklas Laxström
3993415cd9
Localisation updates from https://translatewiki.net .
2017-01-19 05:47:17 +01:00
Niklas Laxström
2e66950029
Localisation updates from https://translatewiki.net .
2017-01-16 03:38:06 +01:00
Tom Hughes
96c91757fc
Don't try and look up traces until the user is logged in
...
Fixes #1411
2017-01-11 21:11:37 +00:00
Niklas Laxström
3f59e82926
Localisation updates from https://translatewiki.net .
2017-01-11 19:37:30 +01:00
Tom Hughes
0ca8b0a327
Place GPS tiles in the overlayPane
2017-01-05 08:45:59 +00:00
Niklas Laxström
78bb2b22f1
Localisation updates from https://translatewiki.net .
2017-01-05 08:26:29 +01:00
Tom Hughes
757ef87179
Use https compatible names for GPS tile servers
2017-01-05 00:15:04 +00:00
Lars Sonchocky-Helldorf
df17b997b3
Add public gps tiles layer for debugging purposes
...
Fixes #1239
Closes #1406
2017-01-04 19:26:15 +00:00
Harry Wood
ea93c0338c
More dependency tweaks for gem2.3 and apache2-dev
...
Closes #1405
2017-01-03 15:06:20 +00:00
Harry Wood
194eaeb687
ruby2.0->ruby 2.3
...
change dependancies. nokogiri requires a later ruby now as pointed out here: https://github.com/openstreetmap/openstreetmap-website/issues/1402 ruby2.0->ruby 2.3 ...which then entails a later ubuntu if we're installing from packages.
2017-01-03 13:40:57 +00:00
Grant Slater
89ba5eab46
Switch vagrant Ubuntu Trusty -> Xenial
2017-01-03 12:42:35 +00:00
Tom Hughes
777b19c775
Make export action send TOTP cookie
2017-01-02 22:51:18 +00:00
Tom Hughes
93631482ce
Make export form send authenticity token
2017-01-02 22:50:59 +00:00
Tom Hughes
9a82ae069a
Remove dot prefix from cookie domain
2017-01-02 21:33:58 +00:00
Tom Hughes
d83cc0f15b
Reduce TOTP cookie expiry to one hour
2017-01-02 21:17:37 +00:00
Tom Hughes
17135cad03
Add support for generating TOTP cookies
...
This allows other sites in the openstreetmap.org domain to validate
that requests are coming from a www.openstreetmap.org user.
2017-01-02 19:01:01 +00:00
Niklas Laxström
08b0cbb7d7
Localisation updates from https://translatewiki.net .
2017-01-02 13:24:49 +01:00
Tom Hughes
a1432b08fb
Update bundle
2017-01-01 18:40:31 +00:00
Han Chao
ade561d3e6
Fix clang build error
...
By default, Clang builds C code in GNU C11 mode, so it uses
standard C99 semantics for the inline keyword:
http://clang.llvm.org/compatibility.html#inline
Closes #1399
2016-12-30 07:38:28 +00:00
Tom Hughes
442994d46d
Add directions for straight on and slight left/right at roundabouts
2016-12-29 19:42:00 +00:00
Tom Hughes
25a5012296
Add directions for left/right turn at a roundabout
2016-12-29 19:27:14 +00:00
Niklas Laxström
f6ba70a852
Localisation updates from https://translatewiki.net .
2016-12-29 08:41:09 +01:00
Bryan Housel
245c49b499
Update to iD v2.0.2
2016-12-22 10:25:58 -05:00
Niklas Laxström
650029ac81
Localisation updates from https://translatewiki.net .
2016-12-22 07:49:25 +01:00
Tom Hughes
7b3aba29ff
Use meta.wikimedia.org for wikimedia authentication
2016-12-21 20:50:15 +00:00
Tom Hughes
109e69efc1
Merge remote-tracking branch 'openstreetmap/pull/1395'
2016-12-21 11:55:19 +00:00
Andy Allan
1bea49103f
Update OWG policy links.
2016-12-21 11:44:57 +00:00
Tom Hughes
69b967c9ff
Add support for Wikimedia authentication
...
Closes #1146
2016-12-20 22:32:25 +00:00
Niklas Laxström
12964ae1e4
Localisation updates from https://translatewiki.net .
2016-12-19 07:50:54 +01:00
Tom Hughes
9badc45929
Load api fixtures in tag model tests
...
We still need them so we have the object to attach tags to.
2016-12-18 17:00:52 +00:00
Tom Hughes
0da97d2d3c
Get rid of hardwired counts in assertions
2016-12-18 16:43:58 +00:00
Tom Hughes
970e1a99d7
Merge remote-tracking branch 'openstreetmap/pull/1367'
2016-12-18 16:29:33 +00:00
Simon Poole
f75e41eac3
Fix misleading wording
...
We can't provide a free unlimited API for any third-party, not just developers. The change should further make translations less bumpy.
2016-12-17 14:36:23 +01:00
Paul Norman
208e24d398
INSTALL.md grammar
2016-12-16 20:58:41 -08:00
Niklas Laxström
2898dbed23
Localisation updates from https://translatewiki.net .
2016-12-15 07:47:28 +01:00
Siebrand Mazeland
b1460f2af9
Localisation updates from https://translatewiki.net .
2016-12-06 13:32:51 +01:00
Tom Hughes
bcba0e1129
Don't collapse spaces in tag keys and values
...
Fixes #1386
2016-12-06 12:08:23 +00:00
Tom Hughes
b9b255fa65
Work around upcoming minitest insanity
...
Minitest 6 will not allow assert_equal to compare for equality
with nil and minitest 5 has already started warning about it.
That's fine if you're comparing with a nil constant, but if you're
comparing with an expression that is sometimes nil and sometimes
not nil it's an absolute pain in the rear end.
2016-12-02 22:29:44 +00:00
Tom Hughes
c8f26592a7
Fix rubocop warnings
2016-12-02 22:01:40 +00:00
Tom Hughes
0e6d4f18da
Update bundle
2016-12-02 21:54:51 +00:00
Tom Hughes
c129a8eec5
Simplify monkey patch
...
The log method has grown new arguments which we weren't passing
on, but fortunately the exception translation is now delegated to
another method so we can patch that instead.
2016-12-02 09:42:05 +00:00
Tom Hughes
ec6e096274
Remove redundant creation of an exception object
2016-12-02 09:38:18 +00:00
Matt Amos
8b03371e10
Make API and web roll back any open transactions on timeout
...
By default the exception thrown by Timeout::timeout is caught
using Kernel::catch so that it cannot be stopped by intermediate
exception handlers. The problem with that is that it stops any
database transactions that were in progress being rolled back
because they never see the exception.
Fortunately passing a class to Timeout::timeout changes it's
behaviour so that the exception is thrown and caught in the normal
way, allowing the database transactions to rollback.
2016-12-02 09:31:45 +00:00
