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

4274 commits

Author SHA1 Message Date
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
Tom Hughes
69b967c9ff Add support for Wikimedia authentication 
Closes #1146
 2016-12-20 22:32:25 +00: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
c8f26592a7 Fix rubocop warnings 2016-12-02 22:01:40 +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
Tom Hughes
de6c33814b Make sure email replies to diary comments come from the right user 2016-11-29 19:30:23 +00:00
Thomas Skowron
fe0f4543c1 Add tab icon for safari/touchbar 
Closes #1382
 2016-11-29 19:01:12 +00:00
Tom Hughes
e5834016fd 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.
 2016-11-28 20:31:04 +00:00
Tom Hughes
34c473f503 Use only_path instead of setting an explicit host 2016-11-24 20:33:36 +00:00
Tom Hughes
1309661b15 Use image_url instead of image_path with the host option 
Fixes #1379
 2016-11-24 20:23:42 +00:00
Andy Allan
1e3a35f971 Add missing xmlns:dc for notes rss 2016-11-24 17:47:16 +00:00
Andy Allan
33a1fca883 Use the assets pipeline for images in the changeset feeds. 
This brings it into line with the other feeds.
 2016-11-24 17:07:59 +00:00
Andy Allan
63271147a0 Use a full url for the image in the diary rss feed. 
This is what was intended by ee2a941d3e
which fixed the same problem in a different place.
 2016-11-24 17:06:14 +00:00
Andy Allan
83e1700d26 Add missing xmlns declaration for diary_entries 
This is already present in the other feeds.
 2016-11-24 11:41:04 +00:00
Martin Raifer
2a2a204125 Fix misspelling (lon -> lng) 
Fixes https://github.com/openstreetmap/iD/issues/3588
Closes #1374
 2016-11-17 20:37:27 +00:00
Bryan Housel
6fae46122e Fix misspelling, @lng -> @lon 2016-11-15 10:40:42 -05:00
Bryan Housel
6c3a31d06c Update to iD v2.0.0 2016-11-15 10:16:34 -05:00
Holger Jeromin
2ed5e97356 Removed duplicate entry for turn straight 2016-11-14 08:57:16 +01:00
Holger Jeromin
c5ca0d3ac5 Fixed typo trun vs turn 2016-11-11 19:30:06 +01:00
Tom Hughes
2308e69582 Update google logo 
Fixes #1364
 2016-11-09 16:16:28 +00:00
Tom Hughes
cbff014368 Disable zoom buttons when zoom limit is reached 
Fixes #1365
 2016-11-09 16:09:32 +00:00
Tom Hughes
e84f0c710d Reject oauth nonces over a day old 2016-11-03 07:14:19 +00:00
Tom Hughes
282ff4936c Fix rubocop warnings 2016-10-31 21:24:10 +00:00
Tom Hughes
48eb8eb369 Merge remote-tracking branch 'openstreetmap/pull/1349' 2016-10-29 18:08:31 +01:00
Andy Allan
4a9aa0a12e 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.
 2016-10-29 17:17:56 +02:00
Andy Allan
968447595b Use dc:creator for note RSS feeds 
The author tag is reserved for email addresses
 2016-10-29 17:14:56 +02:00
Andy Allan
5164c71646 Use dc:creator for diary entry RSS 
The author tag is reserved for email addresses, and we already use
dc:creator in other feeds.
 2016-10-29 17:10:24 +02:00
Andy Allan
ee2a941d3e 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
 2016-10-29 17:08:21 +02:00
Andy Allan
27ee98cf4c Make the image title match the feed title in diary rss 
This is recommended at https://validator.w3.org/feed/docs/warning/ImageTitleDoesntMatch.html
 2016-10-29 17:05:30 +02:00
Tom Hughes
f6695c9079 Merge remote-tracking branch 'openstreetmap/pull/1344' 2016-10-27 11:51:36 +01:00
Mormegil
caac9a9403 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
 2016-10-27 12:34:07 +02:00
Tom Hughes
20aa4ba31b Merge remote-tracking branch 'openstreetmap/pull/1336' 2016-10-26 15:35:18 +01:00
Andy Allan
f464e2a6e9 Suppress XML parsing errors. 
This technique was already used in app/models/changeset.rb

This suppresses the error messages when parsing invalid XML, but
the exceptions are still raised, as tested in test_from_xml_double_lat
in test/models/node_test.rb
 2016-10-26 10:35:03 +01:00
Andy Allan
162f04d789 Convert ACL fixture to a factory, and add some tests 
The fixture was unused, so I took the opportunity to put in a couple
of basic model tests.
 2016-10-26 09:15:56 +01:00
Tom Hughes
7725cd59b4 Keep layer labels on top of the tiles in the layer switcher 
Fixes #1334
 2016-10-21 15:23:37 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Karim Osman
23c79ba2a3 Replace WordPress logo with correct version 
See https://wordpress.org/about/logos/ for official source.

Closes #1329
 2016-10-18 19:02:51 +01:00
Marco Antonio Frias Butrón
1f9857e76c Patch classes on the locate control 
This patches the map on the user page in the same way as the main map.

Closes #1328
 2016-10-17 11:00:01 +01:00
Marco Antonio Frias Butrón
1ba7eccae6 Add cursor style on close icon 
Without this the close icon for the routing panel doesn't change the
pointer as it isn't a link and isn't in a close-wrap container.

Closes #1327
 2016-10-17 10:55:47 +01:00
Mikel Maron
be40536440 merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318 2016-10-12 10:52:05 -04:00
Andy Allan
41e05f0929 Remove unnecessary controller references from the redirect hashes. 
Rails redirect_to uses the current controller by default, so there
is no need to re-iterate this in the code when the redirect targets
the current controller.

The short-form is already used elsewhere, this just tidies up those
which were still using the long-form.
 2016-10-12 14:32:49 +01:00
Mikel Maron
3726d561ea last minor fixes 2016-10-11 20:42:10 -04:00
Mikel Maron
a32076abd6 fix rubocop warnings 2016-10-07 06:32:05 -04:00
Mikel Maron
bb22e23dfb css in right place; fix structure.sql 2016-10-06 21:47:29 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Mikel Maron
3c01d2e80d more idiomatic models for diary entry subscriptions 2016-10-06 20:31:10 -04:00
Andy Allan
3f698e1d15 Fix bugs->notes in comment 2016-10-06 08:59:24 +01:00
Mikel Maron
44b08cc35d not api endpoints, moved to button, fixed notifier message, fixed tests 2016-10-03 22:20:04 -04:00