cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7904 commits 4 branches 1 tag 499 MiB
Commit graph

7904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
e35748567c Update HSTS to publish a max-age=0 to disable it 2017-03-03 11:34:39 +00:00
Tom Hughes
d3b9987bb8 Silence remaining jshint warnings 2017-03-02 10:44:18 +00:00
Tom Hughes
ee12eba234 Don't try and modify policy if we don't have one 2017-03-02 10:39:18 +00:00
Tom Hughes
460a8a106b Update Potlatch 2 to 2.4-46-gea38865 build 2017-03-02 10:33:49 +00:00
Tom Hughes
427f5457d9 Fix some jshint warnings 2017-03-02 10:20:51 +00:00
Tom Hughes
c5ef6404f5 Improve the content security policy 2017-03-01 22:38:24 +00:00
Tom Hughes
d7b4f88d5e Remove inline javascript from page header 2017-03-01 21:19:32 +00:00
Tom Hughes
293fb99467 Remove inline javascript from id views 2017-03-01 18:07:22 +00:00
Tom Hughes
fe159b2417 Correct name of zoom argument for Potlatch 2 
Fixes #1471
 2017-03-01 14:06:05 +00:00
Tom Hughes
1b21b8a209 Remove inline javascript from potlatch2 view 2017-03-01 00:12:42 +00:00
Tom Hughes
8c3d16ecc4 Remove inline javascript from potlatch view 2017-02-28 20:41:22 +00:00
Tom Hughes
56e96d856c Merge remote-tracking branch 'openstreetmap/pull/1469' 2017-02-28 00:21:23 +00:00
Tom Hughes
d13348c0ea Remove inline javascript from user views 2017-02-27 22:51:03 +00:00
Herve Saint-Amand
5bf73f9383 Added new I18N string: notifier.friend_notification.hi 2017-02-27 22:37:52 +00:00
Herve Saint-Amand
b69e8b5c42 Included greeting string in changeset_comment_notification email 2017-02-27 22:36:09 +00:00
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