Tom Hughes
57443546f8
Revert "Update iD frame parameters if the parent URL changes"
...
This reverts commit a6fa8cc273
2017-02-27 14:31:56 +00:00
Tom Hughes
a6fa8cc273
Update iD frame parameters if the parent URL changes
...
Fixes #1468
2017-02-27 13:23:27 +00:00
Tom Hughes
b23bb317c6
Remove fake qqq locale
2017-02-27 13:00:43 +00:00
Niklas Laxström
eb8d7be916
Localisation updates from https://translatewiki.net .
2017-02-27 08:02:07 +01:00
Tom Hughes
428e7d6baa
Merge remote-tracking branch 'openstreetmap/pull/1467'
2017-02-26 22:22:48 +00:00
Simon Poole
12013f60a0
Externalize message about missing OAuth capabilities/permissions and make it less technical
2017-02-26 21:43:43 +01:00
Tom Hughes
40a8e5caf5
Add support for Content-Security-Policy
...
Currently this is report only, and disabled unless a report URL has
been set in the application configuration.
2017-02-26 19:48:13 +00:00
Tom Hughes
8db0548119
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.
2017-02-25 10:57:00 +00:00
Tom Hughes
4b43396ede
Rename 'clickable' to 'interactive' per leaflet 1.x change
2017-02-24 23:10:12 +00:00
Bryan Housel
8346821d66
Update to iD v2.1.3
2017-02-24 16:01:32 -05:00
Tom Hughes
781aab957c
Revert to nokogumbo 1.4.9
...
https://github.com/rubys/nokogumbo/issues/50
2017-02-24 08:35:54 +00:00
Tom Hughes
f8f7cc4628
Update to rails 4.2.8
2017-02-23 21:18:57 +00:00
Tom Hughes
afde3ecd9f
Blacklist VWorld imagery
...
Fixes #1464
2017-02-23 20:21:00 +00:00
Andy Allan
6335891a4c
User factories for browse, oauth_clients and site controller tests.
2017-02-23 14:13:09 +00:00
Tom Hughes
392b68a65f
Merge remote-tracking branch 'openstreetmap/pull/1436'
2017-02-23 10:06:42 +00:00
Tom Hughes
12489a8d83
Remove fake qqq locale
2017-02-23 08:26:49 +00:00
Niklas Laxström
e3c48450fb
Localisation updates from https://translatewiki.net .
2017-02-23 09:11:49 +01:00
Andy Allan
a3618d2b5f
User factory associations for all factories.
2017-02-22 18:51:45 +00:00
Tom Hughes
1a5161a9c8
Remove a few unnecessary attributes from moderator users
2017-02-22 18:30:47 +00:00
Andy Allan
91f3339b6a
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.
2017-02-22 18:26:03 +00:00
Tom Hughes
91e33f50bc
Fix rubocop warning
2017-02-22 17:55:47 +00:00
Tom Hughes
bbd24879fd
Merge remote-tracking branch 'openstreetmap/pull/1458'
2017-02-22 17:55:37 +00:00
Tom Hughes
15934b9b56
Index oauth_tokens and client_applications by user_id
2017-02-22 13:44:57 +00:00
Tom Hughes
df24950854
Merge remote-tracking branch 'openstreetmap/pull/1457'
2017-02-22 12:28:13 +00:00
Andy Allan
f4835594b6
Convert notes_controller tests to user factories.
2017-02-22 11:33:50 +00:00
Andy Allan
c84a371d97
Revert changes where the user is a query parameter
2017-02-22 11:07:43 +00:00
Andy Allan
8bd98b5da8
Refactor api_controller tests to avoid users fixtures.
2017-02-22 11:03:39 +00:00
Andy Allan
38a3e4ba2b
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.
2017-02-22 10:30:53 +00:00
Andy Allan
7d9d496da2
Pass the user object, rather than the id, for sessions.
...
This simplifies the code slightly.
2017-02-22 09:57:18 +00:00
Tom Hughes
1dc2ff7d57
Merge remote-tracking branch 'openstreetmap/pull/1449'
2017-02-21 17:05:39 +00:00
Tom Hughes
ad0e829fc7
Enable context menu on mouse down with no shift pressed
2017-02-21 09:16:38 +00:00
Tom Hughes
d52424087b
Merge remote-tracking branch 'openstreetmap/pull/1451'
2017-02-20 09:05:35 +00:00
Ilya Zverev
a096581039
Add a couple of notes to the vagrant instructions
2017-02-20 12:00:01 +03:00
Tom Hughes
425f3f309b
Use created at for RSS format with note#show
...
This matches other formats and is also what the tests expect.
2017-02-20 08:50:56 +00:00
Tom Hughes
dc834adc86
Remove fake qqq locale
2017-02-20 08:26:24 +00:00
Niklas Laxström
f6c8f12179
Localisation updates from https://translatewiki.net .
2017-02-20 08:45:42 +01:00
Andy Allan
737a325f2e
Refactor diary entry tests to use User factory
2017-02-19 16:43:32 +00:00
Tom Hughes
9b52542e52
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.
2017-02-19 11:50:01 +00:00
Tom Hughes
9c926c6c71
Use the factory to create user blocks
2017-02-19 11:42:38 +00:00
Tom Hughes
1e9a3f8664
Merge remote-tracking branch 'openstreetmap/pull/1445'
2017-02-19 11:38:27 +00:00
Simon Poole
325cd12c24
Make rupocop happy and correct placement of include
2017-02-19 12:35:02 +01:00
Simon Poole
455e906afa
Improve wording and add test
2017-02-19 11:59:34 +01:00
Holger Jeromin
d716e4095b
Fix shift key handling in contextmenu
2017-02-19 09:45:47 +01:00
Simon Poole
998a84a1b4
Small improvement to block status display
2017-02-18 18:08:25 +01:00
Tom Hughes
0bdf29f10b
Merge branch 'contextmenu'
2017-02-18 16:20:20 +00:00
Tom Hughes
af72cb51e9
Fix rubocop warnings
2017-02-18 16:18:04 +00:00
Tom Hughes
8e6a5c21cb
Merge remote-tracking branch 'openstreetmap/pull/1443'
2017-02-18 16:08:04 +00:00
Simon Poole
7f05783949
Make test for a "zero hour" block more robust
2017-02-18 17:05:36 +01:00
Tom Hughes
7a0766a5e6
Apparently some fool things the colon is part of the protocol
2017-02-18 15:38:14 +00:00
Simon Poole
58c61c7962
Actually use user_block
2017-02-18 16:17:46 +01:00
