]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 22 Feb 2017 10:30:53 +0000 (10:30 +0000)]
Refactor amf_controller tests to avoid users fixtures
In all honesty I wouldn't be surprised if there are some semi-hidden
dependencies on the user fixtures here, given the number of magic numbers
all over the place. But this commit takes care of the explicit
dependencies for now.
Andy Allan [Wed, 22 Feb 2017 09:57:18 +0000 (09:57 +0000)]
Pass the user object, rather than the id, for sessions.
This simplifies the code slightly.
Tom Hughes [Tue, 21 Feb 2017 17:05:39 +0000 (17:05 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1449'
Tom Hughes [Tue, 21 Feb 2017 09:16:38 +0000 (09:16 +0000)]
Enable context menu on mouse down with no shift pressed
Tom Hughes [Mon, 20 Feb 2017 09:05:35 +0000 (09:05 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1451'
Ilya Zverev [Mon, 20 Feb 2017 07:38:36 +0000 (10:38 +0300)]
Add a couple of notes to the vagrant instructions
Tom Hughes [Mon, 20 Feb 2017 08:50:56 +0000 (08:50 +0000)]
Use created at for RSS format with note#show
This matches other formats and is also what the tests expect.
Tom Hughes [Mon, 20 Feb 2017 08:26:24 +0000 (08:26 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 20 Feb 2017 07:45:42 +0000 (08:45 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Sun, 19 Feb 2017 16:43:32 +0000 (16:43 +0000)]
Refactor diary entry tests to use User factory
Tom Hughes [Sun, 19 Feb 2017 11:50:01 +0000 (11:50 +0000)]
Use simple string matches for user_blocks_helper tests
Testing against the translations is not something we do anywhere
else is and is dangerously close to testing the helper against
itself which is a bit pointless.
Tom Hughes [Sun, 19 Feb 2017 11:42:38 +0000 (11:42 +0000)]
Use the factory to create user blocks
Tom Hughes [Sun, 19 Feb 2017 11:38:27 +0000 (11:38 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1445'
Simon Poole [Sun, 19 Feb 2017 11:35:02 +0000 (12:35 +0100)]
Make rupocop happy and correct placement of include
Simon Poole [Sun, 19 Feb 2017 10:59:34 +0000 (11:59 +0100)]
Improve wording and add test
Holger Jeromin [Sun, 19 Feb 2017 08:45:47 +0000 (09:45 +0100)]
Fix shift key handling in contextmenu
Simon Poole [Sat, 18 Feb 2017 17:08:25 +0000 (18:08 +0100)]
Small improvement to block status display
Tom Hughes [Sat, 18 Feb 2017 16:20:20 +0000 (16:20 +0000)]
Merge branch 'contextmenu'
Tom Hughes [Sat, 18 Feb 2017 16:18:04 +0000 (16:18 +0000)]
Fix rubocop warnings
Tom Hughes [Sat, 18 Feb 2017 16:08:04 +0000 (16:08 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1443'
Simon Poole [Sat, 18 Feb 2017 16:05:36 +0000 (17:05 +0100)]
Make test for a "zero hour" block more robust
Tom Hughes [Sat, 18 Feb 2017 15:38:14 +0000 (15:38 +0000)]
Apparently some fool things the colon is part of the protocol
Simon Poole [Sat, 18 Feb 2017 15:17:46 +0000 (16:17 +0100)]
Actually use user_block
Simon Poole [Sat, 18 Feb 2017 12:53:21 +0000 (13:53 +0100)]
Add functionality to return a specific message for zero hour blocks
Tom Hughes [Sat, 18 Feb 2017 12:18:34 +0000 (12:18 +0000)]
Preserve protocol in standard links
Tom Hughes [Sat, 18 Feb 2017 12:08:58 +0000 (12:08 +0000)]
Preserve protocol in short links
Tom Hughes [Fri, 17 Feb 2017 19:59:06 +0000 (19:59 +0000)]
Initialise locale before looking up user blocked error
Matt Amos [Fri, 17 Feb 2017 11:52:04 +0000 (11:52 +0000)]
Implement the OWG credit policy for hosting partners.
See https://operations.osmfoundation.org/policies/hosting/
Tom Hughes [Thu, 16 Feb 2017 20:31:34 +0000 (20:31 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1439'
Nicolas Cornu [Thu, 16 Feb 2017 20:14:17 +0000 (21:14 +0100)]
Add line segment to each steps of GraphHopper routing
Nicolas Cornu [Thu, 16 Feb 2017 19:59:04 +0000 (20:59 +0100)]
Fix latLng from GraphHopper engine
latLng is an array and not a latLng object
Nicolas Cornu [Thu, 16 Feb 2017 18:35:27 +0000 (19:35 +0100)]
Add Ascend/Descend when routing with GraphHopper
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.
Herve Saint-Amand [Mon, 13 Feb 2017 12:08:41 +0000 (12:08 +0000)]
Fixed quote style to please rubocop
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.
Herve Saint-Amand [Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)]
merging master into html-mail-fixes
Tom Hughes [Sun, 12 Feb 2017 17:26:17 +0000 (17:26 +0000)]
Allow context menu to add notes without panning the map
Tom Hughes [Sun, 12 Feb 2017 15:50:23 +0000 (15:50 +0000)]
Update Leaflet.contextmenu to the 1.2.1 release
Tom Hughes [Sun, 12 Feb 2017 15:03:56 +0000 (15:03 +0000)]
Make context menu entries translateable
Tom Hughes [Sun, 12 Feb 2017 14:59:28 +0000 (14:59 +0000)]
Improve context menu initialisation to avoid namespace pollution
Tom Hughes [Sun, 12 Feb 2017 15:04:50 +0000 (15:04 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1030' into next
Herve Saint-Amand [Sun, 12 Feb 2017 12:04:43 +0000 (12:04 +0000)]
A better way to contrain the width of the message box whilst also allowing it to shrink on narrow displays
Setting a hard "width" it very compatible, but won't squeeze on narrow screens. Setting max-width works well, except in Outlook and Hotmail. We resort to old skool table tricks: a table with width=100%, with 3 columns, only oneof which, the middle one, had content, and a fixed with. This works.
Herve Saint-Amand [Sat, 11 Feb 2017 21:08:36 +0000 (21:08 +0000)]
Two more "nowrap" instructions removed to accommodate narrower displays
Herve Saint-Amand [Sat, 11 Feb 2017 20:51:03 +0000 (20:51 +0000)]
Remove nowrap on footer text, to accommodate narrow screens
Herve Saint-Amand [Sat, 11 Feb 2017 20:50:28 +0000 (20:50 +0000)]
Set font on title
Nick Ingalls [Thu, 9 Feb 2017 21:40:46 +0000 (16:40 -0500)]
Remove invalid YML
Closes #1434
Herve Saint-Amand [Thu, 9 Feb 2017 21:39:49 +0000 (21:39 +0000)]
Make the mails squeezable on narrow screens
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
Herve Saint-Amand [Thu, 9 Feb 2017 20:38:02 +0000 (20:38 +0000)]
Fixed alignment & underlining bugs in Outlook / WinMail
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 23:23:46 +0000 (23:23 +0000)]
Avoid squished-up grey borders around the message on narrow screens
Herve Saint-Amand [Wed, 8 Feb 2017 23:00:52 +0000 (23:00 +0000)]
Even out the widths of the white bars around the message box
Herve Saint-Amand [Wed, 8 Feb 2017 22:37:00 +0000 (22:37 +0000)]
Better alt text for the logo
This is what clients that block images will display, so shorter is better.
Herve Saint-Amand [Wed, 8 Feb 2017 22:36:21 +0000 (22:36 +0000)]
Use the same fonts for the footer text as for the rest of the mail
Herve Saint-Amand [Wed, 8 Feb 2017 22:35:42 +0000 (22:35 +0000)]
Fix title alignment in Outlook/WindowsMail
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.
Herve Saint-Amand [Wed, 8 Feb 2017 12:02:17 +0000 (12:02 +0000)]
Removed italic styling on message body
Contributor BushmanK pointed out quite rightly that italic isn't appropriate for a full body of text.
Herve Saint-Amand [Fri, 3 Feb 2017 21:22:59 +0000 (21:22 +0000)]
Force the font on every <p> tag
Without this Outlook and Windows Mail don't honour the font set at the top level. Note that this change predates all the screenshots I uploaded to the wiki on 2017-02-02, I'd just forgotten to commit them.
Herve Saint-Amand [Mon, 30 Jan 2017 21:40:20 +0000 (21:40 +0000)]
Tweak cell width for proper centering on narrow screens
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.