rails.git
4 years agoIndex oauth_tokens and client_applications by user_id
Tom Hughes [Wed, 22 Feb 2017 13:44:57 +0000 (13:44 +0000)]
Index oauth_tokens and client_applications by user_id

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1457'
Tom Hughes [Wed, 22 Feb 2017 12:28:13 +0000 (12:28 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1457'

4 years agoRevert changes where the user is a query parameter
Andy Allan [Wed, 22 Feb 2017 11:07:43 +0000 (11:07 +0000)]
Revert changes where the user is a query parameter

4 years agoRefactor amf_controller tests to avoid users fixtures
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.

4 years agoPass the user object, rather than the id, for sessions.
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.

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1449'
Tom Hughes [Tue, 21 Feb 2017 17:05:39 +0000 (17:05 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1449'

4 years agoEnable context menu on mouse down with no shift pressed
Tom Hughes [Tue, 21 Feb 2017 09:16:38 +0000 (09:16 +0000)]
Enable context menu on mouse down with no shift pressed

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1451'
Tom Hughes [Mon, 20 Feb 2017 09:05:35 +0000 (09:05 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1451'

4 years agoAdd a couple of notes to the vagrant instructions
Ilya Zverev [Mon, 20 Feb 2017 07:38:36 +0000 (10:38 +0300)]
Add a couple of notes to the vagrant instructions

4 years agoUse created at for RSS format with note#show
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.

4 years agoRemove fake qqq locale
Tom Hughes [Mon, 20 Feb 2017 08:26:24 +0000 (08:26 +0000)]
Remove fake qqq locale

4 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 20 Feb 2017 07:45:42 +0000 (08:45 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoRefactor diary entry tests to use User factory
Andy Allan [Sun, 19 Feb 2017 16:43:32 +0000 (16:43 +0000)]
Refactor diary entry tests to use User factory

4 years agoUse simple string matches for user_blocks_helper tests
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.

4 years agoUse the factory to create user blocks
Tom Hughes [Sun, 19 Feb 2017 11:42:38 +0000 (11:42 +0000)]
Use the factory to create user blocks

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1445'
Tom Hughes [Sun, 19 Feb 2017 11:38:27 +0000 (11:38 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1445'

4 years agoMake rupocop happy and correct placement of include
Simon Poole [Sun, 19 Feb 2017 11:35:02 +0000 (12:35 +0100)]
Make rupocop happy and correct placement of include

4 years agoImprove wording and add test
Simon Poole [Sun, 19 Feb 2017 10:59:34 +0000 (11:59 +0100)]
Improve wording and add test

4 years agoFix shift key handling in contextmenu
Holger Jeromin [Sun, 19 Feb 2017 08:45:47 +0000 (09:45 +0100)]
Fix shift key handling in contextmenu

4 years agoSmall improvement to block status display
Simon Poole [Sat, 18 Feb 2017 17:08:25 +0000 (18:08 +0100)]
Small improvement to block status display

4 years agoMerge branch 'contextmenu'
Tom Hughes [Sat, 18 Feb 2017 16:20:20 +0000 (16:20 +0000)]
Merge branch 'contextmenu'

4 years agoFix rubocop warnings
Tom Hughes [Sat, 18 Feb 2017 16:18:04 +0000 (16:18 +0000)]
Fix rubocop warnings

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1443'
Tom Hughes [Sat, 18 Feb 2017 16:08:04 +0000 (16:08 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1443'

4 years agoMake test for a "zero hour" block more robust
Simon Poole [Sat, 18 Feb 2017 16:05:36 +0000 (17:05 +0100)]
Make test for a "zero hour" block more robust

4 years agoApparently some fool things the colon is part of the protocol
Tom Hughes [Sat, 18 Feb 2017 15:38:14 +0000 (15:38 +0000)]
Apparently some fool things the colon is part of the protocol

4 years agoActually use user_block
Simon Poole [Sat, 18 Feb 2017 15:17:46 +0000 (16:17 +0100)]
Actually use user_block

4 years agoAdd functionality to return a specific message for zero hour blocks
Simon Poole [Sat, 18 Feb 2017 12:53:21 +0000 (13:53 +0100)]
Add functionality to return a specific message for zero hour blocks

4 years agoPreserve protocol in standard links
Tom Hughes [Sat, 18 Feb 2017 12:18:34 +0000 (12:18 +0000)]
Preserve protocol in standard links

4 years agoPreserve protocol in short links
Tom Hughes [Sat, 18 Feb 2017 12:08:58 +0000 (12:08 +0000)]
Preserve protocol in short links

4 years agoInitialise locale before looking up user blocked error
Tom Hughes [Fri, 17 Feb 2017 19:59:06 +0000 (19:59 +0000)]
Initialise locale before looking up user blocked error

4 years agoImplement the OWG credit policy for hosting partners.
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/

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1439'
Tom Hughes [Thu, 16 Feb 2017 20:31:34 +0000 (20:31 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1439'

4 years agoAdd line segment to each steps of GraphHopper routing
Nicolas Cornu [Thu, 16 Feb 2017 20:14:17 +0000 (21:14 +0100)]
Add line segment to each steps of GraphHopper routing

4 years agoFix latLng from GraphHopper engine
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

4 years agoRemove fake qqq locale
Tom Hughes [Thu, 16 Feb 2017 08:43:34 +0000 (08:43 +0000)]
Remove fake qqq locale

4 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 16 Feb 2017 08:35:31 +0000 (09:35 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAllow a POST with no arguments to trace#edit to fetch the form
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

4 years agoRemove U+200C unicode "zero width non-joiner" from html.dir
Tom Hughes [Mon, 13 Feb 2017 09:57:11 +0000 (09:57 +0000)]
Remove U+200C unicode "zero width non-joiner" from html.dir

4 years agoRemove fake qqq locale
Tom Hughes [Mon, 13 Feb 2017 09:21:04 +0000 (09:21 +0000)]
Remove fake qqq locale

4 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 13 Feb 2017 08:05:41 +0000 (09:05 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAllow context menu to add notes without panning the map
Tom Hughes [Sun, 12 Feb 2017 17:26:17 +0000 (17:26 +0000)]
Allow context menu to add notes without panning the map

4 years agoUpdate Leaflet.contextmenu to the 1.2.1 release
Tom Hughes [Sun, 12 Feb 2017 15:50:23 +0000 (15:50 +0000)]
Update Leaflet.contextmenu to the 1.2.1 release

4 years agoMake context menu entries translateable
Tom Hughes [Sun, 12 Feb 2017 15:03:56 +0000 (15:03 +0000)]
Make context menu entries translateable

4 years agoImprove context menu initialisation to avoid namespace pollution
Tom Hughes [Sun, 12 Feb 2017 14:59:28 +0000 (14:59 +0000)]
Improve context menu initialisation to avoid namespace pollution

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1030' into next
Tom Hughes [Sun, 12 Feb 2017 15:04:50 +0000 (15:04 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1030' into next

4 years agoRemove invalid YML
Nick Ingalls [Thu, 9 Feb 2017 21:40:46 +0000 (16:40 -0500)]
Remove invalid YML

Closes #1434

4 years agoOnly add traces for POST requests
Tom Hughes [Thu, 9 Feb 2017 21:07:44 +0000 (21:07 +0000)]
Only add traces for POST requests

4 years agoOnly create diary entries for POST requests
Tom Hughes [Thu, 9 Feb 2017 21:07:18 +0000 (21:07 +0000)]
Only create diary entries for POST requests

4 years agoTest that GET on message#new can't send a message
Tom Hughes [Thu, 9 Feb 2017 20:39:03 +0000 (20:39 +0000)]
Test that GET on message#new can't send a message

4 years agoRender message properly on error
Tom Hughes [Thu, 9 Feb 2017 20:20:55 +0000 (20:20 +0000)]
Render message properly on error

4 years agoOnly send messages for POST requests
Tom Hughes [Thu, 9 Feb 2017 19:37:48 +0000 (19:37 +0000)]
Only send messages for POST requests

4 years agoRemove fake qqq locale
Tom Hughes [Thu, 9 Feb 2017 08:47:59 +0000 (08:47 +0000)]
Remove fake qqq locale

4 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 9 Feb 2017 07:16:23 +0000 (08:16 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoDon't display a box at all if the note event doesn't include a comment body
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.

4 years agoOnly record a visible object if it exists
Tom Hughes [Wed, 8 Feb 2017 09:53:30 +0000 (09:53 +0000)]
Only record a visible object if it exists

Fixes #1430

4 years agoUpdate to iD v2.1.2
Bryan Housel [Tue, 7 Feb 2017 16:53:11 +0000 (11:53 -0500)]
Update to iD v2.1.2

4 years agoUpdate to iD v2.1.1
Bryan Housel [Mon, 6 Feb 2017 22:08:25 +0000 (17:08 -0500)]
Update to iD v2.1.1

4 years agoMerge remote-tracking branch 'openstreetmap/pull/1426'
Tom Hughes [Mon, 6 Feb 2017 19:10:25 +0000 (19:10 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1426'

4 years agoRemove fake qqq locale
Tom Hughes [Mon, 6 Feb 2017 07:11:25 +0000 (07:11 +0000)]
Remove fake qqq locale

4 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 6 Feb 2017 07:05:21 +0000 (08:05 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoLink GPX fixture files instead of stubbing
Tom Hughes [Sun, 5 Feb 2017 17:24:58 +0000 (17:24 +0000)]
Link GPX fixture files instead of stubbing

4 years agoCleanup double comment markers
Tom Hughes [Sun, 5 Feb 2017 17:25:54 +0000 (17:25 +0000)]
Cleanup double comment markers

4 years agoMake TraceController#list sort by id instead of timestamp
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.

4 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

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

4 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]

4 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'

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

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

4 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

4 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'

4 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.

4 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

4 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.

4 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.

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

4 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.

4 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.

4 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.

4 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.

4 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.

4 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.

4 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

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

4 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.

4 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.

4 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

4 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

4 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

4 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

4 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'

4 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

4 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.

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

4 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.

4 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.

4 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.

4 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

4 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.

4 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