Commit graph

7441 commits

Author SHA1 Message Date
Tom Hughes
44e778aedd Increase password stretching to 10000 interations
This is in line with current reccomendations from various sources.
2016-11-25 08:54:57 +00:00
Tom Hughes
34c473f503 Use only_path instead of setting an explicit host 2016-11-24 20:33:36 +00:00
Tom Hughes
1309661b15 Use image_url instead of image_path with the host option
Fixes #1379
2016-11-24 20:23:42 +00:00
Andy Allan
1e3a35f971 Add missing xmlns:dc for notes rss 2016-11-24 17:47:16 +00:00
Andy Allan
33a1fca883 Use the assets pipeline for images in the changeset feeds.
This brings it into line with the other feeds.
2016-11-24 17:07:59 +00:00
Andy Allan
63271147a0 Use a full url for the image in the diary rss feed.
This is what was intended by ee2a941d3e
which fixed the same problem in a different place.
2016-11-24 17:06:14 +00:00
Andy Allan
83e1700d26 Add missing xmlns declaration for diary_entries
This is already present in the other feeds.
2016-11-24 11:41:04 +00:00
Niklas Laxström
2ca348c392 Localisation updates from https://translatewiki.net. 2016-11-24 08:36:25 +01:00
Tom Hughes
72855280e7 Update to leaflet 1.0.2 2016-11-21 13:17:39 +00:00
Tom Hughes
d17ecc9b83 Merge remote-tracking branch 'openstreetmap/pull/1375' 2016-11-17 20:38:16 +00:00
Martin Raifer
2a2a204125 Fix misspelling (lon -> lng)
Fixes https://github.com/openstreetmap/iD/issues/3588
Closes #1374
2016-11-17 20:37:27 +00:00
Bryan Housel
337bda6a90 Update to iD v2.0.1 2016-11-17 14:24:05 -05:00
Siebrand Mazeland
727f8823d1 Localisation updates from https://translatewiki.net. 2016-11-17 10:08:08 +01:00
Bryan Housel
6fae46122e Fix misspelling, @lng -> @lon 2016-11-15 10:40:42 -05:00
Bryan Housel
6c3a31d06c Update to iD v2.0.0 2016-11-15 10:16:34 -05:00
Holger Jeromin
2ed5e97356 Removed duplicate entry for turn straight 2016-11-14 08:57:16 +01:00
Holger Jeromin
c5ca0d3ac5 Fixed typo trun vs turn 2016-11-11 19:30:06 +01:00
Tom Hughes
7f363a6ce7 Use image_optim_rails instead of image_optim
The rails hooks have been extracted into a separate gem so
this hasn't actually been working since the last image_optim
update happened.
2016-11-10 12:14:19 +00:00
Niklas Laxström
5575f5949c Localisation updates from https://translatewiki.net. 2016-11-10 09:27:56 +01:00
Tom Hughes
b8c80bae2d Stub nominatim for reverse lookups in note tests 2016-11-09 22:07:42 +00:00
Tom Hughes
a73ac770fb Stub nominatim for reverse lookups in diary tests 2016-11-09 21:54:26 +00:00
Tom Hughes
8eca904388 Rename stub_signup_requests to stub_hostip_requests 2016-11-09 20:36:09 +00:00
Tom Hughes
5c9f1310b0 Convert more 'setup do' to 'def setup' for consistency 2016-11-09 20:33:55 +00:00
Tom Hughes
2f722fc281 Merge remote-tracking branch 'openstreetmap/pull/1350' 2016-11-09 20:32:54 +00:00
Tom Hughes
2308e69582 Update google logo
Fixes #1364
2016-11-09 16:16:28 +00:00
Tom Hughes
cbff014368 Disable zoom buttons when zoom limit is reached
Fixes #1365
2016-11-09 16:09:32 +00:00
Andy Allan
f6ba15b1a3 Use 'def setup' instead of 'setup do', for consistency 2016-11-09 16:05:28 +00:00
Andy Allan
7cc1cc618d Extract the hostip.info stubbing into a common method.
There doesn't appear to be any before(:suite) equivalent for Minitest
so this is the least-surprising way to do this.
2016-11-09 16:00:47 +00:00
Tom Hughes
a5a4ab8bcc Expire old oauth nonces 2016-11-07 11:31:58 +00:00
Siebrand Mazeland
f6f00febf5 Localisation updates from https://translatewiki.net. 2016-11-04 21:40:52 +01:00
Siebrand Mazeland
7c78c70456 Localisation updates from https://translatewiki.net. 2016-11-04 12:49:25 +01:00
Tom Hughes
e84f0c710d Reject oauth nonces over a day old 2016-11-03 07:14:19 +00:00
Niklas Laxström
eb21a32ea4 Localisation updates from https://translatewiki.net. 2016-11-03 08:06:35 +01:00
Niklas Laxström
269888802c Localisation updates from https://translatewiki.net. 2016-11-01 08:32:42 +01:00
Tom Hughes
282ff4936c Fix rubocop warnings 2016-10-31 21:24:10 +00:00
Tom Hughes
96b1bff9fb Update bundle 2016-10-31 21:18:28 +00:00
Tom Hughes
fc0aebc1a8 Merge remote-tracking branch 'openstreetmap/pull/1352' 2016-10-30 16:59:20 +00:00
Tom Hughes
ce6368119f Merge remote-tracking branch 'openstreetmap/pull/1351' 2016-10-30 16:57:35 +00:00
Andy Allan
596494a590 Replace changeset_tags fixtures with a factory. 2016-10-30 12:45:02 +01:00
Andy Allan
4eeea7e705 Remove the changesets_subscribers fixture.
Since there is no ChangesetsSubscribers model, we can't use a factory.
Instead we create the associations explicitly when needed.
2016-10-30 12:23:23 +01:00
Andy Allan
4d73706ff3 Refactor the gravatar email changes to use webmock stubbing
The main reason for doing this is to make the tests easier to read,
rather than having to look up both the gravatar fixture, and then
correlate that with the users fixture. Putting the expected response
code in the tests is much more explicit.
2016-10-30 11:06:35 +01:00
Andy Allan
5e86393f72 Use webmock to power the with_http_stubs helper
This involves a small amount of changing the fixtures since we're
using the regexp and not the full url matching powers of webmock.
2016-10-30 10:29:16 +01:00
Andy Allan
90175c3bdb Stub out requests to gravatar.com during tests. 2016-10-30 10:28:58 +01:00
Andy Allan
d3d6e9902c Stub out requests to hostip.info during tests
These are detecting the correct locale for showing terms during signup
2016-10-30 10:28:46 +01:00
Andy Allan
6bc488a983 Add webmock to intercept real http connections during tests
Intercepting real http connections also allows running the test
suite without an internet connection.
2016-10-30 10:28:26 +01:00
Tom Hughes
48eb8eb369 Merge remote-tracking branch 'openstreetmap/pull/1349' 2016-10-29 18:08:31 +01:00
Tom Hughes
d478f94239 Merge remote-tracking branch 'openstreetmap/pull/1348' 2016-10-29 16:26:16 +01:00
Andy Allan
4a9aa0a12e Avoid double-escaping diary entry titles
The XML builder takes care of the escaping, and adding h() lead to
double-escaped titles in the RSS feed.
2016-10-29 17:17:56 +02:00
Andy Allan
968447595b Use dc:creator for note RSS feeds
The author tag is reserved for email addresses
2016-10-29 17:14:56 +02:00
Andy Allan
5164c71646 Use dc:creator for diary entry RSS
The author tag is reserved for email addresses, and we already use
dc:creator in other feeds.
2016-10-29 17:10:24 +02:00