]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 2 Jan 2017 22:50:59 +0000 (22:50 +0000)]
Make export form send authenticity token
Tom Hughes [Mon, 2 Jan 2017 21:33:58 +0000 (21:33 +0000)]
Remove dot prefix from cookie domain
Tom Hughes [Mon, 2 Jan 2017 21:17:37 +0000 (21:17 +0000)]
Reduce TOTP cookie expiry to one hour
Tom Hughes [Fri, 2 Dec 2016 22:42:35 +0000 (22:42 +0000)]
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.
Niklas Laxström [Mon, 2 Jan 2017 12:24:49 +0000 (13:24 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 1 Jan 2017 18:40:31 +0000 (18:40 +0000)]
Update bundle
Han Chao [Fri, 30 Dec 2016 05:09:58 +0000 (13:09 +0800)]
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
Tom Hughes [Thu, 29 Dec 2016 19:42:00 +0000 (19:42 +0000)]
Add directions for straight on and slight left/right at roundabouts
Tom Hughes [Thu, 29 Dec 2016 19:26:42 +0000 (19:26 +0000)]
Add directions for left/right turn at a roundabout
Niklas Laxström [Thu, 29 Dec 2016 07:41:09 +0000 (08:41 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Thu, 22 Dec 2016 15:25:58 +0000 (10:25 -0500)]
Update to iD v2.0.2
Niklas Laxström [Thu, 22 Dec 2016 06:49:25 +0000 (07:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 21 Dec 2016 20:50:15 +0000 (20:50 +0000)]
Use meta.wikimedia.org for wikimedia authentication
Tom Hughes [Wed, 21 Dec 2016 11:55:19 +0000 (11:55 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1395'
Andy Allan [Wed, 21 Dec 2016 11:41:17 +0000 (11:41 +0000)]
Update OWG policy links.
Tom Hughes [Fri, 17 Jun 2016 15:47:03 +0000 (16:47 +0100)]
Add support for Wikimedia authentication
Closes #1146
Niklas Laxström [Mon, 19 Dec 2016 06:50:54 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 18 Dec 2016 17:00:52 +0000 (17:00 +0000)]
Load api fixtures in tag model tests
We still need them so we have the object to attach tags to.
Tom Hughes [Sun, 18 Dec 2016 16:43:58 +0000 (16:43 +0000)]
Get rid of hardwired counts in assertions
Tom Hughes [Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1367'
Simon Poole [Sat, 17 Dec 2016 13:36:23 +0000 (14:36 +0100)]
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.
Paul Norman [Sat, 17 Dec 2016 04:58:41 +0000 (20:58 -0800)]
INSTALL.md grammar
Niklas Laxström [Thu, 15 Dec 2016 06:47:28 +0000 (07:47 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Tue, 6 Dec 2016 12:32:51 +0000 (13:32 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 6 Dec 2016 11:53:23 +0000 (11:53 +0000)]
Don't collapse spaces in tag keys and values
Fixes #1386
Tom Hughes [Fri, 2 Dec 2016 22:29:44 +0000 (22:29 +0000)]
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.
Tom Hughes [Fri, 2 Dec 2016 22:01:40 +0000 (22:01 +0000)]
Fix rubocop warnings
Tom Hughes [Fri, 2 Dec 2016 21:54:51 +0000 (21:54 +0000)]
Update bundle
Tom Hughes [Fri, 2 Dec 2016 09:42:05 +0000 (09:42 +0000)]
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.
Tom Hughes [Fri, 2 Dec 2016 09:38:18 +0000 (09:38 +0000)]
Remove redundant creation of an exception object
Matt Amos [Fri, 2 Dec 2016 09:31:45 +0000 (09:31 +0000)]
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.
Niklas Laxström [Thu, 1 Dec 2016 06:50:52 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 29 Nov 2016 19:30:23 +0000 (19:30 +0000)]
Make sure email replies to diary comments come from the right user
Thomas Skowron [Tue, 29 Nov 2016 19:01:12 +0000 (19:01 +0000)]
Add tab icon for safari/touchbar
Closes #1382
Tom Hughes [Mon, 28 Nov 2016 20:31:04 +0000 (20:31 +0000)]
Clone objects before saving in case of a retry
If a deadlock occurs then the transaction will be retried so we
need to make sure that the object will still be dirty so that it
will be saved again during the retry but that the version won't
be incremented a second time.
Siebrand Mazeland [Mon, 28 Nov 2016 09:16:33 +0000 (10:16 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 25 Nov 2016 08:54:57 +0000 (08:54 +0000)]
Increase password stretching to 10000 interations
This is in line with current reccomendations from various sources.
Tom Hughes [Thu, 24 Nov 2016 20:33:36 +0000 (20:33 +0000)]
Use only_path instead of setting an explicit host
Tom Hughes [Thu, 24 Nov 2016 20:23:42 +0000 (20:23 +0000)]
Use image_url instead of image_path with the host option
Fixes #1379
Andy Allan [Thu, 24 Nov 2016 17:47:16 +0000 (17:47 +0000)]
Add missing xmlns:dc for notes rss
Andy Allan [Thu, 24 Nov 2016 17:07:59 +0000 (17:07 +0000)]
Use the assets pipeline for images in the changeset feeds.
This brings it into line with the other feeds.
Andy Allan [Thu, 24 Nov 2016 17:06:14 +0000 (17:06 +0000)]
Use a full url for the image in the diary rss feed.
This is what was intended by
ee2a941d3eb7279aed5829ddbafe1cc9f9631459
which fixed the same problem in a different place.
Andy Allan [Thu, 24 Nov 2016 11:41:04 +0000 (11:41 +0000)]
Add missing xmlns declaration for diary_entries
This is already present in the other feeds.
Niklas Laxström [Thu, 24 Nov 2016 07:36:25 +0000 (08:36 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 21 Nov 2016 13:17:39 +0000 (13:17 +0000)]
Update to leaflet 1.0.2
Tom Hughes [Thu, 17 Nov 2016 20:38:16 +0000 (20:38 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1375'
Martin Raifer [Thu, 17 Nov 2016 10:47:11 +0000 (11:47 +0100)]
Fix misspelling (lon -> lng)
Fixes https://github.com/openstreetmap/iD/issues/3588
Closes #1374
Bryan Housel [Thu, 17 Nov 2016 19:24:05 +0000 (14:24 -0500)]
Update to iD v2.0.1
Andy Allan [Thu, 17 Nov 2016 11:08:36 +0000 (11:08 +0000)]
Add tags to features before propogating them.
Andy Allan [Thu, 17 Nov 2016 10:49:52 +0000 (10:49 +0000)]
Fix spelling of propagate.
Siebrand Mazeland [Thu, 17 Nov 2016 09:08:08 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.
Bryan Housel [Tue, 15 Nov 2016 15:40:42 +0000 (10:40 -0500)]
Fix misspelling, @lng -> @lon
Bryan Housel [Tue, 15 Nov 2016 15:16:34 +0000 (10:16 -0500)]
Update to iD v2.0.0
Holger Jeromin [Mon, 14 Nov 2016 07:57:16 +0000 (08:57 +0100)]
Removed duplicate entry for turn straight
Holger Jeromin [Fri, 11 Nov 2016 18:30:06 +0000 (19:30 +0100)]
Fixed typo trun vs turn
Tom Hughes [Thu, 10 Nov 2016 12:14:19 +0000 (12:14 +0000)]
Use image_optim_rails instead of image_optim
The rails hooks have been extracted into a separate gem so
this hasn't actually been working since the last image_optim
update happened.
Niklas Laxström [Thu, 10 Nov 2016 08:27:56 +0000 (09:27 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 9 Nov 2016 22:07:42 +0000 (22:07 +0000)]
Stub nominatim for reverse lookups in note tests
Tom Hughes [Wed, 9 Nov 2016 21:54:26 +0000 (21:54 +0000)]
Stub nominatim for reverse lookups in diary tests
Tom Hughes [Wed, 9 Nov 2016 20:36:09 +0000 (20:36 +0000)]
Rename stub_signup_requests to stub_hostip_requests
Tom Hughes [Wed, 9 Nov 2016 20:33:55 +0000 (20:33 +0000)]
Convert more 'setup do' to 'def setup' for consistency
Tom Hughes [Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1350'
Tom Hughes [Wed, 9 Nov 2016 16:16:28 +0000 (16:16 +0000)]
Update google logo
Fixes #1364
Tom Hughes [Wed, 9 Nov 2016 16:09:32 +0000 (16:09 +0000)]
Disable zoom buttons when zoom limit is reached
Fixes #1365
Andy Allan [Wed, 9 Nov 2016 16:04:35 +0000 (16:04 +0000)]
Use 'def setup' instead of 'setup do', for consistency
Andy Allan [Wed, 9 Nov 2016 16:00:47 +0000 (16:00 +0000)]
Extract the hostip.info stubbing into a common method.
There doesn't appear to be any before(:suite) equivalent for Minitest
so this is the least-surprising way to do this.
Tom Hughes [Mon, 7 Nov 2016 11:31:58 +0000 (11:31 +0000)]
Expire old oauth nonces
Siebrand Mazeland [Fri, 4 Nov 2016 20:40:52 +0000 (21:40 +0100)]
Localisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 4 Nov 2016 11:49:25 +0000 (12:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 2 Nov 2016 15:35:45 +0000 (15:35 +0000)]
Reject oauth nonces over a day old
Niklas Laxström [Thu, 3 Nov 2016 07:06:35 +0000 (08:06 +0100)]
Localisation updates from https://translatewiki.net.
Niklas Laxström [Tue, 1 Nov 2016 07:32:42 +0000 (08:32 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 31 Oct 2016 21:24:10 +0000 (21:24 +0000)]
Fix rubocop warnings
Tom Hughes [Mon, 31 Oct 2016 21:18:28 +0000 (21:18 +0000)]
Update bundle
Andy Allan [Mon, 31 Oct 2016 11:30:57 +0000 (12:30 +0100)]
Replace fixtures with factory for relation_tags
Andy Allan [Mon, 31 Oct 2016 10:49:51 +0000 (11:49 +0100)]
Replace fixtures with factory for way_tags
Andy Allan [Sun, 30 Oct 2016 17:28:01 +0000 (18:28 +0100)]
Replace fixtures with factory for node_tags
Tom Hughes [Sun, 30 Oct 2016 16:59:20 +0000 (16:59 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1352'
Tom Hughes [Sun, 30 Oct 2016 16:57:35 +0000 (16:57 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1351'
Andy Allan [Sun, 30 Oct 2016 15:32:11 +0000 (16:32 +0100)]
Replace fixtures with a factory for old_relation_tags
Andy Allan [Sun, 30 Oct 2016 15:15:23 +0000 (16:15 +0100)]
Convert fixtures to factory for old_way_tags
Andy Allan [Sun, 30 Oct 2016 14:36:33 +0000 (15:36 +0100)]
Replace fixtures with a factory for old_node_tags
Also includes a slight simplification of the old_node_tags tests.
Andy Allan [Sun, 30 Oct 2016 11:45:02 +0000 (12:45 +0100)]
Replace changeset_tags fixtures with a factory.
Andy Allan [Sun, 30 Oct 2016 11:23:23 +0000 (12:23 +0100)]
Remove the changesets_subscribers fixture.
Since there is no ChangesetsSubscribers model, we can't use a factory.
Instead we create the associations explicitly when needed.
Andy Allan [Sun, 30 Oct 2016 10:06:35 +0000 (11:06 +0100)]
Refactor the gravatar email changes to use webmock stubbing
The main reason for doing this is to make the tests easier to read,
rather than having to look up both the gravatar fixture, and then
correlate that with the users fixture. Putting the expected response
code in the tests is much more explicit.
Andy Allan [Sat, 29 Oct 2016 17:40:48 +0000 (19:40 +0200)]
Use webmock to power the with_http_stubs helper
This involves a small amount of changing the fixtures since we're
using the regexp and not the full url matching powers of webmock.
Andy Allan [Fri, 28 Oct 2016 12:44:07 +0000 (13:44 +0100)]
Stub out requests to gravatar.com during tests.
Andy Allan [Fri, 28 Oct 2016 12:43:13 +0000 (13:43 +0100)]
Stub out requests to hostip.info during tests
These are detecting the correct locale for showing terms during signup
Andy Allan [Fri, 28 Oct 2016 12:35:48 +0000 (13:35 +0100)]
Add webmock to intercept real http connections during tests
Intercepting real http connections also allows running the test
suite without an internet connection.
Tom Hughes [Sat, 29 Oct 2016 17:08:31 +0000 (18:08 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1349'
Tom Hughes [Sat, 29 Oct 2016 15:26:16 +0000 (16:26 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1348'
Andy Allan [Sat, 29 Oct 2016 14:54:42 +0000 (16:54 +0200)]
Avoid double-escaping diary entry titles
The XML builder takes care of the escaping, and adding h() lead to
double-escaped titles in the RSS feed.
Andy Allan [Sat, 29 Oct 2016 15:14:56 +0000 (17:14 +0200)]
Use dc:creator for note RSS feeds
The author tag is reserved for email addresses
Andy Allan [Sat, 29 Oct 2016 15:10:21 +0000 (17:10 +0200)]
Use dc:creator for diary entry RSS
The author tag is reserved for email addresses, and we already use
dc:creator in other feeds.
Andy Allan [Sat, 29 Oct 2016 15:08:16 +0000 (17:08 +0200)]
Use a full url for the image in the diary rss feed.
Picked up by a validator, see
https://validator.w3.org/feed/docs/error/InvalidFullLink.html
Andy Allan [Sat, 29 Oct 2016 15:05:30 +0000 (17:05 +0200)]
Make the image title match the feed title in diary rss
This is recommended at https://validator.w3.org/feed/docs/warning/ImageTitleDoesntMatch.html
Tom Hughes [Thu, 27 Oct 2016 11:15:28 +0000 (12:15 +0100)]
Require user_roles fixtures
Tom Hughes [Thu, 27 Oct 2016 10:57:32 +0000 (11:57 +0100)]
Update mailmap
Tom Hughes [Thu, 27 Oct 2016 10:51:36 +0000 (11:51 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1344'
Mormegil [Thu, 27 Oct 2016 10:34:07 +0000 (12:34 +0200)]
Ensure IE/Edge compatibility for routing drag&drop
Use the DataTransfer interface properly, using the `text` format, as
IE/Edge does not support much more. We can JSON-serialize anything
there, even though right now, only a single string would be enough.
Also, IE does not support .setDragImage, so check for support prior
to calling.
Fixes #1343