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

7485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Herve Saint-Amand
b5ef2be021 Better loading of attached images 
Got rid of that big ugly base64 blob which was only a temporary crutch anyway. Added a png file instead. Use File.read rather than File.open for a 66% reduction in verbosity.
 2017-01-01 22:11:56 +00:00
Herve Saint-Amand
5f663b765a Tweaked cell padding 
Tweaked cell padding to align the top of the avatar and of the message text a bit better.
 2016-12-31 00:14:24 +00:00
Herve Saint-Amand
94062a17b3 Cleaned up HTML 
Removed some cargo-cult HTML attributes and CSS. Styling HTML for email clients is trickier than for browsers, I'm trying to keep the code as succinct but also as compatible as possible.
 2016-12-30 23:45:32 +00:00
Herve Saint-Amand
1f0f7ba621 avatar inline attachment; text alignment 2016-12-29 23:37:39 +00:00
Herve Saint-Amand
689769cada avatar inline attachment 2016-12-29 23:37:22 +00:00
Herve Saint-Amand
45e90cfd24 reverting erroneous deletion in previous commit 2016-12-29 21:58:02 +00:00
Herve Saint-Amand
e6d19586df intial commit, for 'en' locale only, for changeset_comment_notification only, doesn't load images properly yet 2016-12-29 21:54:46 +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
Niklas Laxström
160a328620 Localisation updates from https://translatewiki.net. 2016-12-01 07:50:52 +01: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
Siebrand Mazeland
ebf443d22d Localisation updates from https://translatewiki.net. 2016-11-28 10:16:33 +01:00
Tom Hughes
44e778aedd Increase password stretching to 10000 interations 
This is in line with current reccomendations from various sources.
 2016-11-25 08:54:57 +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
Niklas Laxström
2ca348c392 Localisation updates from https://translatewiki.net. 2016-11-24 08:36:25 +01:00
Tom Hughes
72855280e7 Update to leaflet 1.0.2 2016-11-21 13:17:39 +00:00
Tom Hughes
d17ecc9b83 Merge remote-tracking branch 'openstreetmap/pull/1375' 2016-11-17 20:38:16 +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
337bda6a90 Update to iD v2.0.1 2016-11-17 14:24:05 -05:00
Andy Allan
898c1475ba Add tags to features before propogating them. 2016-11-17 11:08:36 +00:00
Andy Allan
2f9ed9101a Fix spelling of propagate. 2016-11-17 10:49:52 +00:00