Commit graph

7889 commits

Author SHA1 Message Date
Andy Allan
1a1d924ae0 Use user factory for user_creation test. 2017-03-10 10:57:46 +00:00
Andy Allan
5de04a8cc2 Use user factory for application_helper tests. 2017-03-10 10:53:00 +00:00
Andy Allan
5ae96d6cb7 Use user factory for note_helper tests. 2017-03-10 10:33:59 +00:00
Tom Hughes
685df702ef Merge remote-tracking branch 'openstreetmap/pull/1483' 2017-03-09 18:35:57 +00:00
Tom Hughes
da57077c0b 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.
2017-03-09 18:28:46 +00:00
Tom Hughes
f381ff6fb2 Merge remote-tracking branch 'openstreetmap/pull/1481' 2017-03-09 18:14:34 +00:00
Andy Allan
56e979c353 Remove redundant tests for deleted traces, and rearrange comments and factory calls for consistency. 2017-03-09 17:21:46 +00:00
Andy Allan
8b9ad9bf4b Use user factory for user_roles_helper test 2017-03-09 17:12:11 +00:00
Andy Allan
eac26c9a2c Create a super_user factory. 2017-03-09 16:21:51 +00:00
Andy Allan
18c25b620b Create a fresh user when requesting non-existent traces. 2017-03-09 14:50:02 +00:00
Andy Allan
f2479a8656 Use user factory for message model tests. 2017-03-09 11:52:31 +00:00
Andy Allan
c6c514fce7 Take the user from the node or changeset, rather than referring to the fixture. 2017-03-09 11:29:43 +00:00
Andy Allan
4736586355 Use user factory for note model test. 2017-03-09 11:06:07 +00:00
Andy Allan
8a6956eb22 Use user factory for oauth_token model test. 2017-03-09 11:04:29 +00:00
Andy Allan
5e78831d5c Use user factory for user_preference model tests. 2017-03-09 10:57:57 +00:00
Andy Allan
2267f44954 Use user factory for trace model tests. 2017-03-09 10:53:11 +00:00
Andy Allan
2b06961ce3 Use user factory for trace_controller tests 2017-03-09 10:13:18 +00:00
Tom Hughes
f4d2a01484 Remove fake qqq locale 2017-03-09 07:10:10 +00:00
Niklas Laxström
bf4926abb6 Localisation updates from https://translatewiki.net. 2017-03-09 08:01:16 +01:00
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