rails.git
2 years agoMerge remote-tracking branch 'openstreetmap/pull/1347' into master
Tom Hughes [Sun, 5 Feb 2017 15:56:04 +0000 (15:56 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1347' into master

2 years agoFix rubocop warnings
Tom Hughes [Sun, 5 Feb 2017 14:33:48 +0000 (14:33 +0000)]
Fix rubocop warnings

2 years agoUse .first in place of [0]
Tom Hughes [Sun, 5 Feb 2017 13:57:25 +0000 (13:57 +0000)]
Use .first in place of [0]

2 years agoMerge remote-tracking branch 'openstreetmap/pull/1401'
Tom Hughes [Sun, 5 Feb 2017 13:50:07 +0000 (13:50 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1401'

2 years agoUpdate bundle
Tom Hughes [Sun, 5 Feb 2017 11:13:21 +0000 (11:13 +0000)]
Update bundle

2 years agoUpdate rubocop
Tom Hughes [Sun, 5 Feb 2017 11:02:10 +0000 (11:02 +0000)]
Update rubocop

2 years agoUpdate to iD v2.1.0
Bryan Housel [Sat, 4 Feb 2017 06:18:42 +0000 (01:18 -0500)]
Update to iD v2.1.0

2 years agoMerge remote-tracking branch 'openstreetmap/pull/1423'
Tom Hughes [Thu, 2 Feb 2017 17:21:41 +0000 (17:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1423'

2 years agoConvert the test_users_nearby to user factories.
Andy Allan [Thu, 2 Feb 2017 13:52:26 +0000 (13:52 +0000)]
Convert the test_users_nearby to user factories.

2 years agoUse factory for user language tests
Andy Allan [Thu, 2 Feb 2017 13:33:15 +0000 (13:33 +0000)]
Use factory for user language tests

2 years agoRefactor the friend_users test, and remove the tests which duplicate the (renamed...
Andy Allan [Thu, 2 Feb 2017 13:24:46 +0000 (13:24 +0000)]
Refactor the friend_users test, and remove the tests which duplicate the (renamed) test_friends_with above.

2 years agoConvert test_friend_with to use factories, and use alice/bob/charlie for easier under...
Andy Allan [Thu, 2 Feb 2017 13:20:51 +0000 (13:20 +0000)]
Convert test_friend_with to use factories, and use alice/bob/charlie for easier understanding.

2 years agoUser factory for uniqueness tests
Andy Allan [Thu, 2 Feb 2017 13:09:39 +0000 (13:09 +0000)]
User factory for uniqueness tests

2 years agoConvert class method tests to use User factory.
Andy Allan [Thu, 2 Feb 2017 13:05:37 +0000 (13:05 +0000)]
Convert class method tests to use User factory.

Also improve the tests by being explicit about which results should
be returned, rather than just hoping that the fixtures cover all
possibilities.

2 years agoAdd status traits to user factory.
Andy Allan [Thu, 2 Feb 2017 12:55:32 +0000 (12:55 +0000)]
Add status traits to user factory.

2 years agoAdd moderator_user and administrator_user factories.
Andy Allan [Thu, 2 Feb 2017 12:38:19 +0000 (12:38 +0000)]
Add moderator_user and administrator_user factories.

2 years agoAdd a user_role factory
Andy Allan [Thu, 2 Feb 2017 12:35:29 +0000 (12:35 +0000)]
Add a user_role factory

Naming the association in the model makes the relationship easier
to express in the factory.

2 years agoAdd with_home_location trait for user factories.
Andy Allan [Thu, 2 Feb 2017 12:08:36 +0000 (12:08 +0000)]
Add with_home_location trait for user factories.

2 years agoCreate a simple user factory, and convert some basic tests.
Andy Allan [Wed, 1 Feb 2017 17:42:05 +0000 (17:42 +0000)]
Create a simple user factory, and convert some basic tests.

2 years agoReduce maximum changeset size to 10k changes
Frederik Ramm [Sun, 31 Jul 2016 21:32:27 +0000 (23:32 +0200)]
Reduce maximum changeset size to 10k changes

Ten thousand changes ought to be enough for any normal mapping activity.

Automatic edits and imports are controlled by scripts anyway so it doesn't
make a difference to them as they just have to adapt the limit.

The reason for my suggestion is that large changesets are becoming
increasingly difficult to handle due to frequent timeouts when trying
to load and process them.

The changeset size limit is returned by the API in the "capabilities" request
so client software that honours that information will automatically pick up
the new limit.

Closes #1259

2 years agoRemove fake qqq locale
Tom Hughes [Mon, 30 Jan 2017 16:01:52 +0000 (16:01 +0000)]
Remove fake qqq locale

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 30 Jan 2017 15:50:12 +0000 (16:50 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoThat new message in the HTML version of the mail should also be added to the plain...
Herve Saint-Amand [Sat, 28 Jan 2017 23:29:44 +0000 (23:29 +0000)]
That new message in the HTML version of the mail should also be added to the plain text version of the mail

Duh.

2 years agoUse each_with_object and make the code pithier
Herve Saint-Amand [Sat, 28 Jan 2017 23:27:04 +0000 (23:27 +0000)]
Use each_with_object and make the code pithier

2 years agoRenamed `apply_inline_css` to `style_message` as suggested
Herve Saint-Amand [Sat, 28 Jan 2017 23:08:25 +0000 (23:08 +0000)]
Renamed `apply_inline_css` to `style_message` as suggested

2 years agoSet border=0 on that img
Herve Saint-Amand [Fri, 27 Jan 2017 23:20:11 +0000 (23:20 +0000)]
Set border=0 on that img

IE9 shows a big nasty blue border on linked images if you don't specify border=0

2 years agoConvert client applications fixtures into a factory
Andy Allan [Thu, 26 Jan 2017 18:03:13 +0000 (18:03 +0000)]
Convert client applications fixtures into a factory

Closes #1415

2 years agoMerge remote-tracking branch 'openstreetmap/pull/1416'
Tom Hughes [Thu, 26 Jan 2017 17:51:13 +0000 (17:51 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1416'

2 years agoLoad user fixtures for ChangesetComment model tests
Tom Hughes [Thu, 26 Jan 2017 17:50:11 +0000 (17:50 +0000)]
Load user fixtures for ChangesetComment model tests

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 26 Jan 2017 10:16:34 +0000 (11:16 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoLeft-align logo
Herve Saint-Amand [Wed, 25 Jan 2017 23:01:37 +0000 (23:01 +0000)]
Left-align logo

2 years agoApply inline styling to all <p> tags
Herve Saint-Amand [Wed, 25 Jan 2017 22:50:52 +0000 (22:50 +0000)]
Apply inline styling to all <p> tags

Solved the problem of <p> tags being given different padding or color by different clients, without having to copy-paste a string of CSS into every <p> tag in the templates.

2 years agoRemove unused user_tokens fixture and pointless test.
Andy Allan [Wed, 25 Jan 2017 16:43:04 +0000 (16:43 +0000)]
Remove unused user_tokens fixture and pointless test.

2 years agoPut the user avatar in a <p> block
Herve Saint-Amand [Mon, 23 Jan 2017 22:26:34 +0000 (22:26 +0000)]
Put the user avatar in a <p> block

This improves rendering on those clients that set the margin to 0 on <p> blocks.

2 years agoUpdate to leaflet 1.0.3
Tom Hughes [Mon, 23 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Update to leaflet 1.0.3

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 23 Jan 2017 12:15:00 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUpdate Potlatch 2 to 2.4-32-gecf1e0b build
Tom Hughes [Thu, 19 Jan 2017 15:03:56 +0000 (15:03 +0000)]
Update Potlatch 2 to 2.4-32-gecf1e0b build

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 19 Jan 2017 04:47:17 +0000 (05:47 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoRubocop says to use "hash rockets"
Herve Saint-Amand [Mon, 16 Jan 2017 23:12:59 +0000 (23:12 +0000)]
Rubocop says to use "hash rockets"

Rubocop will have its way.

2 years agoConvert those <nobr> tags to CSS
Herve Saint-Amand [Mon, 16 Jan 2017 22:53:04 +0000 (22:53 +0000)]
Convert those <nobr> tags to CSS

2 years agoRefactored the code to invoke the message body partial layout, as suggested in the PR
Herve Saint-Amand [Mon, 16 Jan 2017 22:50:01 +0000 (22:50 +0000)]
Refactored the code to invoke the message body partial layout, as suggested in the PR

2 years agoMove attach_project_logo to be its own before_action filter, as suggested
Herve Saint-Amand [Mon, 16 Jan 2017 21:21:55 +0000 (21:21 +0000)]
Move attach_project_logo to be its own before_action filter, as suggested

2 years agoRenamed @user_message_author to @author as suggested
Herve Saint-Amand [Mon, 16 Jan 2017 21:13:52 +0000 (21:13 +0000)]
Renamed @user_message_author to @author as suggested

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 16 Jan 2017 02:38:06 +0000 (03:38 +0100)]
Localisation updates from https://translatewiki.net.

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 agoDon't try and look up traces until the user is logged in
Tom Hughes [Wed, 11 Jan 2017 21:11:37 +0000 (21:11 +0000)]
Don't try and look up traces until the user is logged in

Fixes #1411

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Wed, 11 Jan 2017 18:37:30 +0000 (19:37 +0100)]
Localisation updates from https://translatewiki.net.

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 agoPlace GPS tiles in the overlayPane
Tom Hughes [Thu, 5 Jan 2017 08:45:59 +0000 (08:45 +0000)]
Place GPS tiles in the overlayPane

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 5 Jan 2017 07:26:29 +0000 (08:26 +0100)]
Localisation updates from https://translatewiki.net.

2 years agoUse https compatible names for GPS tile servers
Tom Hughes [Thu, 5 Jan 2017 00:15:04 +0000 (00:15 +0000)]
Use https compatible names for GPS tile servers

2 years agoAdd public gps tiles layer for debugging purposes
Lars Sonchocky-Helldorf [Wed, 4 Jan 2017 19:24:23 +0000 (19:24 +0000)]
Add public gps tiles layer for debugging purposes

Fixes #1239
Closes #1406

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 dependency tweaks for gem2.3 and apache2-dev
Harry Wood [Tue, 3 Jan 2017 14:12:05 +0000 (14:12 +0000)]
More dependency tweaks for gem2.3 and apache2-dev

Closes #1405

2 years agoruby2.0->ruby 2.3
Harry Wood [Tue, 3 Jan 2017 13:40:57 +0000 (13:40 +0000)]
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.

2 years agoSwitch vagrant Ubuntu Trusty -> Xenial
Grant Slater [Tue, 3 Jan 2017 12:42:35 +0000 (12:42 +0000)]
Switch vagrant Ubuntu Trusty -> Xenial

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 agoMake export action send TOTP cookie
Tom Hughes [Mon, 2 Jan 2017 22:51:18 +0000 (22:51 +0000)]
Make export action send TOTP cookie

2 years agoMake export form send authenticity token
Tom Hughes [Mon, 2 Jan 2017 22:50:59 +0000 (22:50 +0000)]
Make export form send authenticity token

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 agoRemove dot prefix from cookie domain
Tom Hughes [Mon, 2 Jan 2017 21:33:58 +0000 (21:33 +0000)]
Remove dot prefix from cookie domain

2 years agoReduce TOTP cookie expiry to one hour
Tom Hughes [Mon, 2 Jan 2017 21:17:37 +0000 (21:17 +0000)]
Reduce TOTP cookie expiry to one hour

2 years agoAdd support for generating TOTP cookies
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.

2 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 2 Jan 2017 12:24:49 +0000 (13:24 +0100)]
Localisation updates from https://translatewiki.net.

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 agoUpdate bundle
Tom Hughes [Sun, 1 Jan 2017 18:40:31 +0000 (18:40 +0000)]
Update bundle

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 agoFix clang build error
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

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