Commit graph

7720 commits

Author SHA1 Message Date
Tom Hughes
33669daefb Do more preloading in browse controller methods
Fixes #1476
2017-03-07 09:10:24 +00:00
Tom Hughes
d86380e7b5 Fix accidental change in comments 2017-03-06 18:01:26 +00:00
Tom Hughes
49c3af4a32 Merge remote-tracking branch 'openstreetmap/pull/1477' 2017-03-06 17:54:26 +00:00
Tom Hughes
88d16deadd Detect a timeout encapsulated in ActionView::Template::Error
Fixes #1476
2017-03-06 17:50:09 +00:00
Andy Allan
d007956865 Use user factory for swf_controller tests. 2017-03-06 17:28:06 +00:00
Andy Allan
1d9e12b330 Use user factory for message_controller tests. 2017-03-06 17:25:55 +00:00
Andy Allan
f1397f4700 Use user factory for user_roles_controller tests. 2017-03-06 16:55:05 +00:00
Tom Hughes
6c0501d62a Fix hiding of sidebar loading indicator
Fixes #1475
2017-03-06 12:22:14 +00:00
Tom Hughes
21040f36a3 Remove fake qqq locale 2017-03-06 09:00:16 +00:00
Niklas Laxström
34c85f39f3 Localisation updates from https://translatewiki.net. 2017-03-06 09:03:14 +01:00
Tom Hughes
dff0eef787 Remove inline styles 2017-03-05 19:51:01 +00:00
Andy Allan
4bcd13a024 Use users factory for user_preferences_controller tests. 2017-03-05 16:47:40 +00:00
Andy Allan
02f7fb96e5 Use users factory for user_blocks_controller tests. 2017-03-05 16:34:59 +00:00
Andy Allan
912da4fc1e Use users factory for redactions_controller tests. 2017-03-05 16:34:36 +00:00
Han Chao
49a7921ec8 Use local api to export map.osm
Closes #1282
2017-03-05 10:37:25 +00:00
Tom Hughes
b954416a70 Merge remote-tracking branch 'openstreetmap/pull/1437' 2017-03-05 10:34:23 +00:00
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