rails.git
2 years agoRevert "Added a greeting to the changeset comment message"
Herve Saint-Amand [Sat, 14 Jan 2017 21:48:46 +0000 (21:48 +0000)]
Revert "Added a greeting to the changeset comment message"

This reverts commit 39c3fa427ea273e9011c380f9d2f2a9759cddb24.

2 years agoRemove that ugly style="margin: 0"
Herve Saint-Amand [Fri, 13 Jan 2017 22:58:57 +0000 (22:58 +0000)]
Remove that ugly style="margin: 0"

It's really only needed for rendering in Yahoo. Let's try to do without having to copy-paste that into every html template.

2 years agoSimplified the partial layout
Herve Saint-Amand [Fri, 13 Jan 2017 22:43:23 +0000 (22:43 +0000)]
Simplified the partial layout

Rather than wrap the body in a :body block, just make it the default, unnamed block, which keeps the markup more lightweight.

2 years agoLogo was being attached twice on changeset comment notifications
Herve Saint-Amand [Fri, 13 Jan 2017 21:45:52 +0000 (21:45 +0000)]
Logo was being attached twice on changeset comment notifications

2 years agoDressed up note comment messages
Herve Saint-Amand [Thu, 12 Jan 2017 23:02:57 +0000 (23:02 +0000)]
Dressed up note comment messages

2 years agoDressed up lost password mail
Herve Saint-Amand [Thu, 12 Jan 2017 22:30:31 +0000 (22:30 +0000)]
Dressed up lost password mail

2 years agoDressed up gpx notification mails
Herve Saint-Amand [Thu, 12 Jan 2017 22:28:09 +0000 (22:28 +0000)]
Dressed up gpx notification mails

2 years agoDressed up friend_notification mail
Herve Saint-Amand [Thu, 12 Jan 2017 22:11:23 +0000 (22:11 +0000)]
Dressed up friend_notification mail

2 years agoAdded a greeting to the changeset comment message
Herve Saint-Amand [Thu, 12 Jan 2017 21:52:17 +0000 (21:52 +0000)]
Added a greeting to the changeset comment message

The greeting includes the recipient's user name (as for the message notification mail), which should increase the recipient's trust that the message isn't spam. Greetings were reused from each language's respective locale flie.

2 years agoRubocop finds 'return' statements redundant
Herve Saint-Amand [Wed, 11 Jan 2017 23:26:56 +0000 (23:26 +0000)]
Rubocop finds 'return' statements redundant

2 years agoModify tests to search only text parts
Herve Saint-Amand [Wed, 11 Jan 2017 23:17:24 +0000 (23:17 +0000)]
Modify tests to search only text parts

The tests assumed that every part in the multipart emails that we send were either plain text or HTML. Now we have image attachments, against whose contents the tests were still trying to match regexes. The tests have been modified to only run regexes on the text parts of the mails.

2 years agoRemoved unbalanced tag HTML tag
Herve Saint-Amand [Wed, 11 Jan 2017 22:03:00 +0000 (22:03 +0000)]
Removed unbalanced tag HTML tag

2 years agoDressed up a few more messages.
Herve Saint-Amand [Mon, 9 Jan 2017 23:42:43 +0000 (23:42 +0000)]
Dressed up a few more messages.

email_confirm, message_notification and signup_confirm now use the new templates. This fixes some, but not all, of the currently broken tests.

2 years agoMoved message table HTMl to a partial template
Herve Saint-Amand [Sun, 8 Jan 2017 22:09:10 +0000 (22:09 +0000)]
Moved message table HTMl to a partial template

Several notifications are about a message having been sent from one user to another via OSM. I've moved the code for the HTML table that holds the actual user message, with the avatar and the body text, to its own partial template, so that it can be reused. I've updated a second notifier message to the new template, diary_comment_notification.

2 years agoFirst steps towards using layouts
Herve Saint-Amand [Fri, 6 Jan 2017 22:37:28 +0000 (22:37 +0000)]
First steps towards using layouts

Since all HTML mails will presumably share the same overall layout, and the markup is fairly dense, it makes sense to use Rails layouts to share the structure across mail templates. This commit moves the core structure of the HTML mail to a layout. It will need to be further refined so that notifications that involve a text message sent by another user can share the avatar-and-message-text structure.

2 years agoRemove HTML markup from locale file
Herve Saint-Amand [Tue, 3 Jan 2017 22:38:58 +0000 (22:38 +0000)]
Remove HTML markup from locale file

Rather than including HTML markup in the locale file (which also has the inconvenience of requiring both a plain-text and an HTML duplicate of the same string), move the markup to the template. Also added a helper to reduce clutter in the template slightly.

2 years agoMore compact image paths
Herve Saint-Amand [Mon, 2 Jan 2017 23:48:49 +0000 (23:48 +0000)]
More compact image paths

Make the file paths to image assets more compact. I investigated using `image_path` but could only get it to return the path for a public URL, which is different and also includes the asset pipeline digest.

2 years agoProper way to get path to small avatar
Herve Saint-Amand [Mon, 2 Jan 2017 21:35:59 +0000 (21:35 +0000)]
Proper way to get path to small avatar

Rather than performing perilous string substitution on paths, just use the built-in way to select the small version of the avatar image file.

2 years agoFixed quotes
Herve Saint-Amand [Sun, 1 Jan 2017 23:39:42 +0000 (23:39 +0000)]
Fixed quotes

Replaced single quotes with double quotes, to comply with rubocop rules.

2 years agoRemove unused variable
Herve Saint-Amand [Sun, 1 Jan 2017 22:39:07 +0000 (22:39 +0000)]
Remove unused variable

2 years agoUse parameterised server root URL rather than hardcoded
Herve Saint-Amand [Sun, 1 Jan 2017 22:35:59 +0000 (22:35 +0000)]
Use parameterised server root URL rather than hardcoded

2 years agoRemove unused import
Herve Saint-Amand [Sun, 1 Jan 2017 22:33:22 +0000 (22:33 +0000)]
Remove unused import

2 years agoMove localised text to locale file
Herve Saint-Amand [Sun, 1 Jan 2017 22:30:41 +0000 (22:30 +0000)]
Move localised text to locale file

Moved a string of English text that will require translation from the HTML template to the locale I18N file.

2 years agoBetter loading of attached images
Herve Saint-Amand [Sun, 1 Jan 2017 22:11:56 +0000 (22:11 +0000)]
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.

2 years agoTweaked cell padding
Herve Saint-Amand [Sat, 31 Dec 2016 00:14:24 +0000 (00:14 +0000)]
Tweaked cell padding

Tweaked cell padding to align the top of the avatar and of the message text a bit better.

2 years agoCleaned up HTML
Herve Saint-Amand [Fri, 30 Dec 2016 23:45:32 +0000 (23:45 +0000)]
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.

2 years agoavatar inline attachment; text alignment
Herve Saint-Amand [Thu, 29 Dec 2016 23:37:39 +0000 (23:37 +0000)]
avatar inline attachment; text alignment

2 years agoavatar inline attachment
Herve Saint-Amand [Thu, 29 Dec 2016 23:37:22 +0000 (23:37 +0000)]
avatar inline attachment

2 years agoreverting erroneous deletion in previous commit
Herve Saint-Amand [Thu, 29 Dec 2016 21:58:02 +0000 (21:58 +0000)]
reverting erroneous deletion in previous commit

2 years agointial commit, for 'en' locale only, for changeset_comment_notification only, doesn...
Herve Saint-Amand [Thu, 29 Dec 2016 21:54:46 +0000 (21:54 +0000)]
intial commit, for 'en' locale only, for changeset_comment_notification only, doesn't load images properly yet

2 years agoAdd directions for straight on and slight left/right at roundabouts
Tom Hughes [Thu, 29 Dec 2016 19:42:00 +0000 (19:42 +0000)]
Add directions for straight on and slight left/right at roundabouts

2 years agoAdd directions for left/right turn at a roundabout
Tom Hughes [Thu, 29 Dec 2016 19:26:42 +0000 (19:26 +0000)]
Add directions for left/right turn at a roundabout

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 29 Dec 2016 07:41:09 +0000 (08:41 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate to iD v2.0.2
Bryan Housel [Thu, 22 Dec 2016 15:25:58 +0000 (10:25 -0500)]
Update to iD v2.0.2

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 22 Dec 2016 06:49:25 +0000 (07:49 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUse meta.wikimedia.org for wikimedia authentication
Tom Hughes [Wed, 21 Dec 2016 20:50:15 +0000 (20:50 +0000)]
Use meta.wikimedia.org for wikimedia authentication

2 years agoMerge remote-tracking branch 'openstreetmap/pull/1395'
Tom Hughes [Wed, 21 Dec 2016 11:55:19 +0000 (11:55 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1395'

2 years agoUpdate OWG policy links.
Andy Allan [Wed, 21 Dec 2016 11:41:17 +0000 (11:41 +0000)]
Update OWG policy links.

2 years agoAdd support for Wikimedia authentication
Tom Hughes [Fri, 17 Jun 2016 15:47:03 +0000 (16:47 +0100)]
Add support for Wikimedia authentication

Closes #1146

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 19 Dec 2016 06:50:54 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLoad api fixtures in tag model tests
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.

2 years agoGet rid of hardwired counts in assertions
Tom Hughes [Sun, 18 Dec 2016 16:43:58 +0000 (16:43 +0000)]
Get rid of hardwired counts in assertions

2 years agoMerge remote-tracking branch 'openstreetmap/pull/1367'
Tom Hughes [Sun, 18 Dec 2016 16:29:33 +0000 (16:29 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1367'

2 years agoFix misleading wording
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.

2 years agoINSTALL.md grammar
Paul Norman [Sat, 17 Dec 2016 04:58:41 +0000 (20:58 -0800)]
INSTALL.md grammar

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 15 Dec 2016 06:47:28 +0000 (07:47 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Tue, 6 Dec 2016 12:32:51 +0000 (13:32 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoDon't collapse spaces in tag keys and values
Tom Hughes [Tue, 6 Dec 2016 11:53:23 +0000 (11:53 +0000)]
Don't collapse spaces in tag keys and values

Fixes #1386

3 years agoWork around upcoming minitest insanity
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.

3 years agoFix rubocop warnings
Tom Hughes [Fri, 2 Dec 2016 22:01:40 +0000 (22:01 +0000)]
Fix rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Fri, 2 Dec 2016 21:54:51 +0000 (21:54 +0000)]
Update bundle

3 years agoSimplify monkey patch
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.

3 years agoRemove redundant creation of an exception object
Tom Hughes [Fri, 2 Dec 2016 09:38:18 +0000 (09:38 +0000)]
Remove redundant creation of an exception object

3 years agoMake API and web roll back any open transactions on timeout
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.

3 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 1 Dec 2016 06:50:52 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoMake sure email replies to diary comments come from the right user
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

3 years agoAdd tab icon for safari/touchbar
Thomas Skowron [Tue, 29 Nov 2016 19:01:12 +0000 (19:01 +0000)]
Add tab icon for safari/touchbar

Closes #1382

3 years agoClone objects before saving in case of a retry
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.

3 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 28 Nov 2016 09:16:33 +0000 (10:16 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoIncrease password stretching to 10000 interations
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.

3 years agoUse only_path instead of setting an explicit host
Tom Hughes [Thu, 24 Nov 2016 20:33:36 +0000 (20:33 +0000)]
Use only_path instead of setting an explicit host

3 years agoUse image_url instead of image_path with the host option
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

3 years agoAdd missing xmlns:dc for notes rss
Andy Allan [Thu, 24 Nov 2016 17:47:16 +0000 (17:47 +0000)]
Add missing xmlns:dc for notes rss

3 years agoUse the assets pipeline for images in the changeset feeds.
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.

3 years agoUse a full url for the image in the diary rss feed.
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.

3 years agoAdd missing xmlns declaration for diary_entries
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.

3 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 24 Nov 2016 07:36:25 +0000 (08:36 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUpdate to leaflet 1.0.2
Tom Hughes [Mon, 21 Nov 2016 13:17:39 +0000 (13:17 +0000)]
Update to leaflet 1.0.2

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1375'
Tom Hughes [Thu, 17 Nov 2016 20:38:16 +0000 (20:38 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1375'

3 years agoFix misspelling (lon -> lng)
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

3 years agoUpdate to iD v2.0.1
Bryan Housel [Thu, 17 Nov 2016 19:24:05 +0000 (14:24 -0500)]
Update to iD v2.0.1

3 years agoAdd tags to features before propogating them.
Andy Allan [Thu, 17 Nov 2016 11:08:36 +0000 (11:08 +0000)]
Add tags to features before propogating them.

3 years agoFix spelling of propagate.
Andy Allan [Thu, 17 Nov 2016 10:49:52 +0000 (10:49 +0000)]
Fix spelling of propagate.

3 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 17 Nov 2016 09:08:08 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoFix misspelling, @lng -> @lon
Bryan Housel [Tue, 15 Nov 2016 15:40:42 +0000 (10:40 -0500)]
Fix misspelling, @lng -> @lon

3 years agoUpdate to iD v2.0.0
Bryan Housel [Tue, 15 Nov 2016 15:16:34 +0000 (10:16 -0500)]
Update to iD v2.0.0

3 years agoRemoved duplicate entry for turn straight
Holger Jeromin [Mon, 14 Nov 2016 07:57:16 +0000 (08:57 +0100)]
Removed duplicate entry for turn straight

3 years agoFixed typo trun vs turn
Holger Jeromin [Fri, 11 Nov 2016 18:30:06 +0000 (19:30 +0100)]
Fixed typo trun vs turn

3 years agoUse image_optim_rails instead of image_optim
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.

3 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 10 Nov 2016 08:27:56 +0000 (09:27 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoStub nominatim for reverse lookups in note tests
Tom Hughes [Wed, 9 Nov 2016 22:07:42 +0000 (22:07 +0000)]
Stub nominatim for reverse lookups in note tests

3 years agoStub nominatim for reverse lookups in diary tests
Tom Hughes [Wed, 9 Nov 2016 21:54:26 +0000 (21:54 +0000)]
Stub nominatim for reverse lookups in diary tests

3 years agoRename stub_signup_requests to stub_hostip_requests
Tom Hughes [Wed, 9 Nov 2016 20:36:09 +0000 (20:36 +0000)]
Rename stub_signup_requests to stub_hostip_requests

3 years agoConvert more 'setup do' to 'def setup' for consistency
Tom Hughes [Wed, 9 Nov 2016 20:33:55 +0000 (20:33 +0000)]
Convert more 'setup do' to 'def setup' for consistency

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1350'
Tom Hughes [Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1350'

3 years agoUpdate google logo
Tom Hughes [Wed, 9 Nov 2016 16:16:28 +0000 (16:16 +0000)]
Update google logo

Fixes #1364

3 years agoDisable zoom buttons when zoom limit is reached
Tom Hughes [Wed, 9 Nov 2016 16:09:32 +0000 (16:09 +0000)]
Disable zoom buttons when zoom limit is reached

Fixes #1365

3 years agoUse 'def setup' instead of 'setup do', for consistency
Andy Allan [Wed, 9 Nov 2016 16:04:35 +0000 (16:04 +0000)]
Use 'def setup' instead of 'setup do', for consistency

3 years agoExtract the hostip.info stubbing into a common method.
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.

3 years agoExpire old oauth nonces
Tom Hughes [Mon, 7 Nov 2016 11:31:58 +0000 (11:31 +0000)]
Expire old oauth nonces

3 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 4 Nov 2016 20:40:52 +0000 (21:40 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Fri, 4 Nov 2016 11:49:25 +0000 (12:49 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoReject oauth nonces over a day old
Tom Hughes [Wed, 2 Nov 2016 15:35:45 +0000 (15:35 +0000)]
Reject oauth nonces over a day old

3 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 3 Nov 2016 07:06:35 +0000 (08:06 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoLocalisation 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.

3 years agoFix rubocop warnings
Tom Hughes [Mon, 31 Oct 2016 21:24:10 +0000 (21:24 +0000)]
Fix rubocop warnings

3 years agoUpdate bundle
Tom Hughes [Mon, 31 Oct 2016 21:18:28 +0000 (21:18 +0000)]
Update bundle

3 years agoReplace fixtures with factory for relation_tags
Andy Allan [Mon, 31 Oct 2016 11:30:57 +0000 (12:30 +0100)]
Replace fixtures with factory for relation_tags

3 years agoReplace fixtures with factory for way_tags
Andy Allan [Mon, 31 Oct 2016 10:49:51 +0000 (11:49 +0100)]
Replace fixtures with factory for way_tags

3 years agoReplace fixtures with factory for node_tags
Andy Allan [Sun, 30 Oct 2016 17:28:01 +0000 (18:28 +0100)]
Replace fixtures with factory for node_tags