rails.git
3 years agoRemove inline styles
Tom Hughes [Sun, 5 Mar 2017 19:51:01 +0000 (19:51 +0000)]
Remove inline styles

3 years agoUse users factory for user_preferences_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:47:40 +0000 (16:47 +0000)]
Use users factory for user_preferences_controller tests.

3 years agoUse users factory for user_blocks_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:59 +0000 (16:34 +0000)]
Use users factory for user_blocks_controller tests.

3 years agoUse users factory for redactions_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:36 +0000 (16:34 +0000)]
Use users factory for redactions_controller tests.

3 years agoUse local api to export map.osm
Han Chao [Sun, 5 Mar 2017 10:37:25 +0000 (10:37 +0000)]
Use local api to export map.osm

Closes #1282

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1437'
Tom Hughes [Sun, 5 Mar 2017 10:34:23 +0000 (10:34 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1437'

3 years agoUpdate HSTS to publish a max-age=0 to disable it
Tom Hughes [Fri, 3 Mar 2017 11:34:39 +0000 (11:34 +0000)]
Update HSTS to publish a max-age=0 to disable it

3 years agoSilence remaining jshint warnings
Tom Hughes [Thu, 2 Mar 2017 10:44:18 +0000 (10:44 +0000)]
Silence remaining jshint warnings

3 years agoDon't try and modify policy if we don't have one
Tom Hughes [Thu, 2 Mar 2017 10:39:18 +0000 (10:39 +0000)]
Don't try and modify policy if we don't have one

3 years agoUpdate Potlatch 2 to 2.4-46-gea38865 build
Tom Hughes [Thu, 2 Mar 2017 10:33:49 +0000 (10:33 +0000)]
Update Potlatch 2 to 2.4-46-gea38865 build

3 years agoFix some jshint warnings
Tom Hughes [Thu, 2 Mar 2017 10:20:51 +0000 (10:20 +0000)]
Fix some jshint warnings

3 years agoImprove the content security policy
Tom Hughes [Wed, 1 Mar 2017 22:38:24 +0000 (22:38 +0000)]
Improve the content security policy

3 years agoRemove inline javascript from page header
Tom Hughes [Wed, 1 Mar 2017 21:19:32 +0000 (21:19 +0000)]
Remove inline javascript from page header

3 years agoRemove inline javascript from id views
Tom Hughes [Wed, 1 Mar 2017 18:07:22 +0000 (18:07 +0000)]
Remove inline javascript from id views

3 years agoCorrect name of zoom argument for Potlatch 2
Tom Hughes [Wed, 1 Mar 2017 14:06:05 +0000 (14:06 +0000)]
Correct name of zoom argument for Potlatch 2

Fixes #1471

3 years agoRemove inline javascript from potlatch2 view
Tom Hughes [Tue, 28 Feb 2017 20:37:23 +0000 (20:37 +0000)]
Remove inline javascript from potlatch2 view

3 years agoRemove inline javascript from potlatch view
Tom Hughes [Tue, 28 Feb 2017 18:27:14 +0000 (18:27 +0000)]
Remove inline javascript from potlatch view

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1469'
Tom Hughes [Tue, 28 Feb 2017 00:21:23 +0000 (00:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1469'

3 years agoRemove inline javascript from user views
Tom Hughes [Mon, 27 Feb 2017 22:48:36 +0000 (22:48 +0000)]
Remove inline javascript from user views

3 years agoAdded new I18N string: notifier.friend_notification.hi
Herve Saint-Amand [Mon, 27 Feb 2017 22:37:52 +0000 (22:37 +0000)]
Added new I18N string: notifier.friend_notification.hi

3 years agoIncluded greeting string in changeset_comment_notification email
Herve Saint-Amand [Mon, 27 Feb 2017 22:36:09 +0000 (22:36 +0000)]
Included greeting string in changeset_comment_notification email

3 years agoRevert "Update iD frame parameters if the parent URL changes"
Tom Hughes [Mon, 27 Feb 2017 14:31:56 +0000 (14:31 +0000)]
Revert "Update iD frame parameters if the parent URL changes"

This reverts commit a6fa8cc273017c2673d6d76dae7f5ac811c2027d.

3 years agoUpdate iD frame parameters if the parent URL changes
Tom Hughes [Mon, 27 Feb 2017 13:23:27 +0000 (13:23 +0000)]
Update iD frame parameters if the parent URL changes

Fixes #1468

3 years agoRemove fake qqq locale
Tom Hughes [Mon, 27 Feb 2017 13:00:43 +0000 (13:00 +0000)]
Remove fake qqq locale

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

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1467'
Tom Hughes [Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1467'

3 years agoExternalize message about missing OAuth capabilities/permissions and make it less...
Simon Poole [Sun, 26 Feb 2017 20:43:43 +0000 (21:43 +0100)]
Externalize message about missing OAuth capabilities/permissions and make it less technical

3 years agoAdd support for Content-Security-Policy
Tom Hughes [Sun, 26 Feb 2017 19:34:31 +0000 (19:34 +0000)]
Add support for Content-Security-Policy

Currently this is report only, and disabled unless a report URL has
been set in the application configuration.

3 years agoRemove explicit context menu width
Tom Hughes [Sat, 25 Feb 2017 10:57:00 +0000 (10:57 +0000)]
Remove explicit context menu width

Firefox and Chromium at least seem to autosize correctly based
on the actual text in use for a given locale.

3 years agoRename 'clickable' to 'interactive' per leaflet 1.x change
Tom Hughes [Fri, 24 Feb 2017 23:10:12 +0000 (23:10 +0000)]
Rename 'clickable' to 'interactive' per leaflet 1.x change

3 years agoUpdate to iD v2.1.3
Bryan Housel [Fri, 24 Feb 2017 21:01:32 +0000 (16:01 -0500)]
Update to iD v2.1.3

3 years agoRevert to nokogumbo 1.4.9
Tom Hughes [Fri, 24 Feb 2017 08:35:54 +0000 (08:35 +0000)]
Revert to nokogumbo 1.4.9

https://github.com/rubys/nokogumbo/issues/50

3 years agoUpdate to rails 4.2.8
Tom Hughes [Thu, 23 Feb 2017 21:18:57 +0000 (21:18 +0000)]
Update to rails 4.2.8

3 years agoBlacklist VWorld imagery
Tom Hughes [Thu, 23 Feb 2017 20:21:00 +0000 (20:21 +0000)]
Blacklist VWorld imagery

Fixes #1464

3 years agoUser factories for browse, oauth_clients and site controller tests.
Andy Allan [Thu, 23 Feb 2017 14:13:09 +0000 (14:13 +0000)]
User factories for browse, oauth_clients and site controller tests.

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1436'
Tom Hughes [Thu, 23 Feb 2017 10:06:42 +0000 (10:06 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1436'

3 years agoRemove fake qqq locale
Tom Hughes [Thu, 23 Feb 2017 08:26:49 +0000 (08:26 +0000)]
Remove fake qqq locale

3 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 23 Feb 2017 08:11:49 +0000 (09:11 +0100)]
Localisation updates from https://translatewiki.net.

3 years agoUser factory associations for all factories.
Andy Allan [Wed, 22 Feb 2017 18:51:45 +0000 (18:51 +0000)]
User factory associations for all factories.

3 years agoRemove a few unnecessary attributes from moderator users
Tom Hughes [Wed, 22 Feb 2017 18:30:47 +0000 (18:30 +0000)]
Remove a few unnecessary attributes from moderator users

3 years agoMake all factory-generated users 'normal'
Andy Allan [Wed, 22 Feb 2017 18:14:53 +0000 (18:14 +0000)]
Make all factory-generated users 'normal'

The use of create(:normal_user) makes the tests needlessly harder to
understand and reason about, particularly when we start using
associations in the factories.

3 years agoFix rubocop warning
Tom Hughes [Wed, 22 Feb 2017 17:54:50 +0000 (17:54 +0000)]
Fix rubocop warning

3 years agoMerge remote-tracking branch 'openstreetmap/pull/1458'
Tom Hughes [Wed, 22 Feb 2017 17:55:37 +0000 (17:55 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1458'

3 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

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

3 years agoConvert notes_controller tests to user factories.
Andy Allan [Wed, 22 Feb 2017 11:33:50 +0000 (11:33 +0000)]
Convert notes_controller tests to user factories.

3 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

3 years agoRefactor api_controller tests to avoid users fixtures.
Andy Allan [Wed, 22 Feb 2017 11:03:39 +0000 (11:03 +0000)]
Refactor api_controller tests to avoid users fixtures.

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

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

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

3 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

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

3 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

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

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

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

3 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

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

3 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

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

3 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

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

3 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

3 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

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

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

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

3 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

3 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

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

3 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

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

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

3 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

3 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/

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

3 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

3 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

3 years agoAdd Ascend/Descend when routing with GraphHopper
Nicolas Cornu [Thu, 16 Feb 2017 18:35:27 +0000 (19:35 +0100)]
Add Ascend/Descend when routing with GraphHopper

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

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

3 years agoFixed quote style to please rubocop
Herve Saint-Amand [Mon, 13 Feb 2017 12:08:41 +0000 (12:08 +0000)]
Fixed quote style to please rubocop

3 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

3 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

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

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

3 years agomerging master into html-mail-fixes
Herve Saint-Amand [Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)]
merging master into html-mail-fixes

3 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

3 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

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

3 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

3 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

3 years agoA better way to contrain the width of the message box whilst also allowing it to...
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.

3 years agoTwo more "nowrap" instructions removed to accommodate narrower displays
Herve Saint-Amand [Sat, 11 Feb 2017 21:08:36 +0000 (21:08 +0000)]
Two more "nowrap" instructions removed to accommodate narrower displays

3 years agoRemove nowrap on footer text, to accommodate narrow screens
Herve Saint-Amand [Sat, 11 Feb 2017 20:51:03 +0000 (20:51 +0000)]
Remove nowrap on footer text, to accommodate narrow screens

3 years agoSet font on title
Herve Saint-Amand [Sat, 11 Feb 2017 20:50:28 +0000 (20:50 +0000)]
Set font on title

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

Closes #1434

3 years agoMake the mails squeezable on narrow screens
Herve Saint-Amand [Thu, 9 Feb 2017 21:39:49 +0000 (21:39 +0000)]
Make the mails squeezable on narrow screens

3 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