]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 16 Feb 2017 08:43:34 +0000 (08:43 +0000)]
Remove fake qqq locale
Niklas Laxström [Thu, 16 Feb 2017 08:35:31 +0000 (09:35 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 13 Feb 2017 10:09:43 +0000 (10:09 +0000)]
Allow a POST with no arguments to trace#edit to fetch the form
Tom Hughes [Mon, 13 Feb 2017 09:57:11 +0000 (09:57 +0000)]
Remove U+200C unicode "zero width non-joiner" from html.dir
Tom Hughes [Mon, 13 Feb 2017 09:21:04 +0000 (09:21 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 13 Feb 2017 08:05:41 +0000 (09:05 +0100)]
Localisation updates from https://translatewiki.net.
Nick Ingalls [Thu, 9 Feb 2017 21:40:46 +0000 (16:40 -0500)]
Remove invalid YML
Closes #1434
Tom Hughes [Thu, 9 Feb 2017 21:07:44 +0000 (21:07 +0000)]
Only add traces for POST requests
Tom Hughes [Thu, 9 Feb 2017 21:07:18 +0000 (21:07 +0000)]
Only create diary entries for POST requests
Tom Hughes [Thu, 9 Feb 2017 20:39:03 +0000 (20:39 +0000)]
Test that GET on message#new can't send a message
Tom Hughes [Thu, 9 Feb 2017 20:20:55 +0000 (20:20 +0000)]
Render message properly on error
Tom Hughes [Thu, 9 Feb 2017 19:37:48 +0000 (19:37 +0000)]
Only send messages for POST requests
Tom Hughes [Thu, 9 Feb 2017 08:47:59 +0000 (08:47 +0000)]
Remove fake qqq locale
Niklas Laxström [Thu, 9 Feb 2017 07:16:23 +0000 (08:16 +0100)]
Localisation updates from https://translatewiki.net.
Herve Saint-Amand [Wed, 8 Feb 2017 22:22:21 +0000 (22:22 +0000)]
Don't display a box at all if the note event doesn't include a comment body
Before this it just displays en empty box, which looks wrong.
Tom Hughes [Wed, 8 Feb 2017 09:53:30 +0000 (09:53 +0000)]
Only record a visible object if it exists
Fixes #1430
Bryan Housel [Tue, 7 Feb 2017 16:53:11 +0000 (11:53 -0500)]
Update to iD v2.1.2
Bryan Housel [Mon, 6 Feb 2017 22:08:25 +0000 (17:08 -0500)]
Update to iD v2.1.1
Tom Hughes [Mon, 6 Feb 2017 19:10:25 +0000 (19:10 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1426'
Tom Hughes [Mon, 6 Feb 2017 07:11:25 +0000 (07:11 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 6 Feb 2017 07:05:21 +0000 (08:05 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 5 Feb 2017 17:24:58 +0000 (17:24 +0000)]
Link GPX fixture files instead of stubbing
Tom Hughes [Sun, 5 Feb 2017 17:25:54 +0000 (17:25 +0000)]
Cleanup double comment markers
Tom Hughes [Sun, 5 Feb 2017 16:18:56 +0000 (16:18 +0000)]
Make TraceController#list sort by id instead of timestamp
The effect is much the same but id is guaranteed to give a stable
sort if two traces have the same timestamp.
Tom Hughes [Sun, 5 Feb 2017 15:56:04 +0000 (15:56 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1347' into master
Tom Hughes [Sun, 5 Feb 2017 14:33:48 +0000 (14:33 +0000)]
Fix rubocop warnings
Tom Hughes [Sun, 5 Feb 2017 13:57:25 +0000 (13:57 +0000)]
Use .first in place of [0]
Tom Hughes [Sun, 5 Feb 2017 13:50:07 +0000 (13:50 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1401'
Tom Hughes [Sun, 5 Feb 2017 11:13:21 +0000 (11:13 +0000)]
Update bundle
Tom Hughes [Sun, 5 Feb 2017 11:02:10 +0000 (11:02 +0000)]
Update rubocop
Bryan Housel [Sat, 4 Feb 2017 06:18:42 +0000 (01:18 -0500)]
Update to iD v2.1.0
Tom Hughes [Thu, 2 Feb 2017 17:21:41 +0000 (17:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1423'
Andy Allan [Thu, 2 Feb 2017 13:52:26 +0000 (13:52 +0000)]
Convert the test_users_nearby to user factories.
Andy Allan [Thu, 2 Feb 2017 13:33:15 +0000 (13:33 +0000)]
Use factory for user language tests
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.
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.
Andy Allan [Thu, 2 Feb 2017 13:09:39 +0000 (13:09 +0000)]
User factory for uniqueness tests
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.
Andy Allan [Thu, 2 Feb 2017 12:55:32 +0000 (12:55 +0000)]
Add status traits to user factory.
Andy Allan [Thu, 2 Feb 2017 12:38:19 +0000 (12:38 +0000)]
Add moderator_user and administrator_user factories.
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.
Andy Allan [Thu, 2 Feb 2017 12:08:36 +0000 (12:08 +0000)]
Add with_home_location trait for user factories.
Andy Allan [Wed, 1 Feb 2017 17:42:05 +0000 (17:42 +0000)]
Create a simple user factory, and convert some basic tests.
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
Tom Hughes [Mon, 30 Jan 2017 16:01:52 +0000 (16:01 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 30 Jan 2017 15:50:12 +0000 (16:50 +0100)]
Localisation updates from https://translatewiki.net.
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.
Herve Saint-Amand [Sat, 28 Jan 2017 23:27:04 +0000 (23:27 +0000)]
Use each_with_object and make the code pithier
Herve Saint-Amand [Sat, 28 Jan 2017 23:08:25 +0000 (23:08 +0000)]
Renamed `apply_inline_css` to `style_message` as suggested
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
Andy Allan [Thu, 26 Jan 2017 18:03:13 +0000 (18:03 +0000)]
Convert client applications fixtures into a factory
Closes #1415
Tom Hughes [Thu, 26 Jan 2017 17:51:13 +0000 (17:51 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1416'
Tom Hughes [Thu, 26 Jan 2017 17:50:11 +0000 (17:50 +0000)]
Load user fixtures for ChangesetComment model tests
Niklas Laxström [Thu, 26 Jan 2017 10:16:34 +0000 (11:16 +0100)]
Localisation updates from https://translatewiki.net.
Herve Saint-Amand [Wed, 25 Jan 2017 23:01:37 +0000 (23:01 +0000)]
Left-align logo
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.
Andy Allan [Wed, 25 Jan 2017 16:43:04 +0000 (16:43 +0000)]
Remove unused user_tokens fixture and pointless test.
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.
Tom Hughes [Mon, 23 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Update to leaflet 1.0.3
Niklas Laxström [Mon, 23 Jan 2017 12:15:00 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 19 Jan 2017 15:03:56 +0000 (15:03 +0000)]
Update Potlatch 2 to
2.4-32-gecf1e0b build
Niklas Laxström [Thu, 19 Jan 2017 04:47:17 +0000 (05:47 +0100)]
Localisation updates from https://translatewiki.net.
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.
Herve Saint-Amand [Mon, 16 Jan 2017 22:53:04 +0000 (22:53 +0000)]
Convert those <nobr> tags to CSS
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
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
Herve Saint-Amand [Mon, 16 Jan 2017 21:13:52 +0000 (21:13 +0000)]
Renamed @user_message_author to @author as suggested
Niklas Laxström [Mon, 16 Jan 2017 02:38:06 +0000 (03:38 +0100)]
Localisation updates from https://translatewiki.net.
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 .
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.
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.
Herve Saint-Amand [Fri, 13 Jan 2017 21:45:52 +0000 (21:45 +0000)]
Logo was being attached twice on changeset comment notifications
Herve Saint-Amand [Thu, 12 Jan 2017 23:02:57 +0000 (23:02 +0000)]
Dressed up note comment messages
Herve Saint-Amand [Thu, 12 Jan 2017 22:30:31 +0000 (22:30 +0000)]
Dressed up lost password mail
Herve Saint-Amand [Thu, 12 Jan 2017 22:28:09 +0000 (22:28 +0000)]
Dressed up gpx notification mails
Herve Saint-Amand [Thu, 12 Jan 2017 22:11:23 +0000 (22:11 +0000)]
Dressed up friend_notification mail
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.
Herve Saint-Amand [Wed, 11 Jan 2017 23:26:56 +0000 (23:26 +0000)]
Rubocop finds 'return' statements redundant
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.
Herve Saint-Amand [Wed, 11 Jan 2017 22:03:00 +0000 (22:03 +0000)]
Removed unbalanced tag HTML tag
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
Niklas Laxström [Wed, 11 Jan 2017 18:37:30 +0000 (19:37 +0100)]
Localisation updates from https://translatewiki.net.
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.
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.
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.
Tom Hughes [Thu, 5 Jan 2017 08:45:59 +0000 (08:45 +0000)]
Place GPS tiles in the overlayPane
Niklas Laxström [Thu, 5 Jan 2017 07:26:29 +0000 (08:26 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 5 Jan 2017 00:15:04 +0000 (00:15 +0000)]
Use https compatible names for GPS tile servers
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
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.
Harry Wood [Tue, 3 Jan 2017 14:12:05 +0000 (14:12 +0000)]
More dependency tweaks for gem2.3 and apache2-dev
Closes #1405
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.
Grant Slater [Tue, 3 Jan 2017 12:42:35 +0000 (12:42 +0000)]
Switch vagrant Ubuntu Trusty -> Xenial
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.
Tom Hughes [Mon, 2 Jan 2017 22:51:18 +0000 (22:51 +0000)]
Make export action send TOTP cookie
Tom Hughes [Mon, 2 Jan 2017 22:50:59 +0000 (22:50 +0000)]
Make export form send authenticity token
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.
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.