]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 9 Mar 2017 18:35:57 +0000 (18:35 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1483'
Tom Hughes [Thu, 9 Mar 2017 18:28:46 +0000 (18:28 +0000)]
Improve trace#api_data tests
The api_data action doesn't actually take the username as an
arguement and should be modelled on api_read rather than the
actions that handle web views.
Tom Hughes [Thu, 9 Mar 2017 18:14:34 +0000 (18:14 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1481'
Andy Allan [Thu, 9 Mar 2017 17:21:46 +0000 (17:21 +0000)]
Remove redundant tests for deleted traces, and rearrange comments and factory calls for consistency.
Andy Allan [Thu, 9 Mar 2017 16:59:44 +0000 (16:59 +0000)]
Use user factory for user_roles_helper test
Andy Allan [Thu, 9 Mar 2017 16:21:51 +0000 (16:21 +0000)]
Create a super_user factory.
Andy Allan [Thu, 9 Mar 2017 14:50:02 +0000 (14:50 +0000)]
Create a fresh user when requesting non-existent traces.
Andy Allan [Thu, 9 Mar 2017 11:52:31 +0000 (11:52 +0000)]
Use user factory for message model tests.
Andy Allan [Thu, 9 Mar 2017 11:29:43 +0000 (11:29 +0000)]
Take the user from the node or changeset, rather than referring to the fixture.
Andy Allan [Thu, 9 Mar 2017 11:06:07 +0000 (11:06 +0000)]
Use user factory for note model test.
Andy Allan [Thu, 9 Mar 2017 11:04:29 +0000 (11:04 +0000)]
Use user factory for oauth_token model test.
Andy Allan [Thu, 9 Mar 2017 10:57:57 +0000 (10:57 +0000)]
Use user factory for user_preference model tests.
Andy Allan [Thu, 9 Mar 2017 10:53:11 +0000 (10:53 +0000)]
Use user factory for trace model tests.
Andy Allan [Thu, 9 Mar 2017 10:13:18 +0000 (10:13 +0000)]
Use user factory for trace_controller tests
Tom Hughes [Thu, 9 Mar 2017 07:10:10 +0000 (07:10 +0000)]
Remove fake qqq locale
Niklas Laxström [Thu, 9 Mar 2017 07:01:16 +0000 (08:01 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Tue, 7 Mar 2017 09:10:24 +0000 (09:10 +0000)]
Do more preloading in browse controller methods
Fixes #1476
Tom Hughes [Mon, 6 Mar 2017 18:01:26 +0000 (18:01 +0000)]
Fix accidental change in comments
Tom Hughes [Mon, 6 Mar 2017 17:54:26 +0000 (17:54 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1477'
Tom Hughes [Mon, 6 Mar 2017 17:50:09 +0000 (17:50 +0000)]
Detect a timeout encapsulated in ActionView::Template::Error
Fixes #1476
Andy Allan [Mon, 6 Mar 2017 17:28:06 +0000 (17:28 +0000)]
Use user factory for swf_controller tests.
Andy Allan [Mon, 6 Mar 2017 17:25:55 +0000 (17:25 +0000)]
Use user factory for message_controller tests.
Andy Allan [Mon, 6 Mar 2017 16:55:05 +0000 (16:55 +0000)]
Use user factory for user_roles_controller tests.
Tom Hughes [Mon, 6 Mar 2017 12:22:14 +0000 (12:22 +0000)]
Fix hiding of sidebar loading indicator
Fixes #1475
Tom Hughes [Mon, 6 Mar 2017 09:00:16 +0000 (09:00 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 6 Mar 2017 08:03:14 +0000 (09:03 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 5 Mar 2017 19:51:01 +0000 (19:51 +0000)]
Remove inline styles
Andy Allan [Sun, 5 Mar 2017 16:47:40 +0000 (16:47 +0000)]
Use users factory for user_preferences_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:59 +0000 (16:34 +0000)]
Use users factory for user_blocks_controller tests.
Andy Allan [Sun, 5 Mar 2017 16:34:36 +0000 (16:34 +0000)]
Use users factory for redactions_controller tests.
Han Chao [Sun, 5 Mar 2017 10:37:25 +0000 (10:37 +0000)]
Use local api to export map.osm
Closes #1282
Tom Hughes [Sun, 5 Mar 2017 10:34:23 +0000 (10:34 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1437'
Tom Hughes [Fri, 3 Mar 2017 11:34:39 +0000 (11:34 +0000)]
Update HSTS to publish a max-age=0 to disable it
Tom Hughes [Thu, 2 Mar 2017 10:44:18 +0000 (10:44 +0000)]
Silence remaining jshint warnings
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
Tom Hughes [Thu, 2 Mar 2017 10:33:49 +0000 (10:33 +0000)]
Update Potlatch 2 to
2.4-46-gea38865 build
Tom Hughes [Thu, 2 Mar 2017 10:20:51 +0000 (10:20 +0000)]
Fix some jshint warnings
Tom Hughes [Wed, 1 Mar 2017 22:38:24 +0000 (22:38 +0000)]
Improve the content security policy
Tom Hughes [Wed, 1 Mar 2017 21:19:32 +0000 (21:19 +0000)]
Remove inline javascript from page header
Tom Hughes [Wed, 1 Mar 2017 18:07:22 +0000 (18:07 +0000)]
Remove inline javascript from id views
Tom Hughes [Wed, 1 Mar 2017 14:06:05 +0000 (14:06 +0000)]
Correct name of zoom argument for Potlatch 2
Fixes #1471
Tom Hughes [Tue, 28 Feb 2017 20:37:23 +0000 (20:37 +0000)]
Remove inline javascript from potlatch2 view
Tom Hughes [Tue, 28 Feb 2017 18:27:14 +0000 (18:27 +0000)]
Remove inline javascript from potlatch view
Tom Hughes [Tue, 28 Feb 2017 00:21:23 +0000 (00:21 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1469'
Tom Hughes [Mon, 27 Feb 2017 22:48:36 +0000 (22:48 +0000)]
Remove inline javascript from user views
Herve Saint-Amand [Mon, 27 Feb 2017 22:37:52 +0000 (22:37 +0000)]
Added new I18N string: notifier.friend_notification.hi
Herve Saint-Amand [Mon, 27 Feb 2017 22:36:09 +0000 (22:36 +0000)]
Included greeting string in changeset_comment_notification email
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 .
Tom Hughes [Mon, 27 Feb 2017 13:23:27 +0000 (13:23 +0000)]
Update iD frame parameters if the parent URL changes
Fixes #1468
Tom Hughes [Mon, 27 Feb 2017 13:00:43 +0000 (13:00 +0000)]
Remove fake qqq locale
Niklas Laxström [Mon, 27 Feb 2017 07:02:07 +0000 (08:02 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1467'
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
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.
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.
Tom Hughes [Fri, 24 Feb 2017 23:10:12 +0000 (23:10 +0000)]
Rename 'clickable' to 'interactive' per leaflet 1.x change
Bryan Housel [Fri, 24 Feb 2017 21:01:32 +0000 (16:01 -0500)]
Update to iD v2.1.3
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
Tom Hughes [Thu, 23 Feb 2017 21:18:57 +0000 (21:18 +0000)]
Update to rails 4.2.8
Tom Hughes [Thu, 23 Feb 2017 20:21:00 +0000 (20:21 +0000)]
Blacklist VWorld imagery
Fixes #1464
Andy Allan [Thu, 23 Feb 2017 14:13:09 +0000 (14:13 +0000)]
User factories for browse, oauth_clients and site controller tests.
Tom Hughes [Thu, 23 Feb 2017 10:06:42 +0000 (10:06 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1436'
Tom Hughes [Thu, 23 Feb 2017 08:26:49 +0000 (08:26 +0000)]
Remove fake qqq locale
Niklas Laxström [Thu, 23 Feb 2017 08:11:49 +0000 (09:11 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 22 Feb 2017 18:51:45 +0000 (18:51 +0000)]
User factory associations for all factories.
Tom Hughes [Wed, 22 Feb 2017 18:30:47 +0000 (18:30 +0000)]
Remove a few unnecessary attributes from moderator users
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.
Tom Hughes [Wed, 22 Feb 2017 17:54:50 +0000 (17:54 +0000)]
Fix rubocop warning
Tom Hughes [Wed, 22 Feb 2017 17:55:37 +0000 (17:55 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1458'
Tom Hughes [Wed, 22 Feb 2017 13:44:57 +0000 (13:44 +0000)]
Index oauth_tokens and client_applications by user_id
Tom Hughes [Wed, 22 Feb 2017 12:28:13 +0000 (12:28 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/1457'
Andy Allan [Wed, 22 Feb 2017 11:33:50 +0000 (11:33 +0000)]
Convert notes_controller tests to user factories.
Andy Allan [Wed, 22 Feb 2017 11:07:43 +0000 (11:07 +0000)]
Revert changes where the user is a query parameter
Andy Allan [Wed, 22 Feb 2017 11:03:39 +0000 (11:03 +0000)]
Refactor api_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.
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