Commit graph

6531 commits

Author SHA1 Message Date
Tom Hughes
2f22843732 Merge branch 'comments' 2014-11-01 11:43:21 +00:00
Siebrand Mazeland
1d9fe46af1 Localisation updates from https://translatewiki.net. 2014-10-27 18:58:16 +01:00
Tom Hughes
b83c5b4b50 Fixes for offline mode 2014-10-26 11:39:00 +00:00
John Firebaugh
6f2dcedf71 Update to iD v1.6.2 2014-10-24 09:26:09 -07:00
John Firebaugh
8c2731a416 Update to iD v1.6.1 2014-10-23 15:29:26 -07:00
Tom Hughes
f636391580 Move changeset comment feeds out of the API namespace 2014-10-23 21:40:13 +01:00
Tom Hughes
72a7fc67ca Tidy up changeset comment tests and beef them up a bit 2014-10-23 21:24:51 +01:00
Tom Hughes
8598db3233 Tidy up changeset comment code 2014-10-23 21:24:51 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
2014-10-23 21:24:51 +01:00
Siebrand Mazeland
653b4c93bc Localisation updates from https://translatewiki.net. 2014-10-23 21:37:57 +02:00
Siebrand Mazeland
d83664100c Localisation updates from https://translatewiki.net. 2014-10-20 19:07:29 +02:00
Tom Hughes
24476ec205 Update Potlatch 2 to 2.3-648-g9cab056 build 2014-10-20 09:04:15 +01:00
Tom Hughes
f5f71dd42c Merge remote-tracking branch 'osmlab/iD-1.6.0' 2014-10-17 17:21:37 +01:00
Tom Hughes
3fefae42fc Add some more model tests for notes and note comments 2014-10-16 20:36:40 +01:00
Tom Hughes
8983fb3600 Validate note comments for control characters 2014-10-16 00:59:34 +01:00
Tom Hughes
0fb047589f Add missing event types to note comment fixtures 2014-10-16 00:59:24 +01:00
Tom Hughes
366ba78901 Update Potlatch 2 to 2.3-645-g81e8bcb build 2014-10-14 11:10:06 +01:00
Tom Hughes
69893849ca Don't pass the hash when routing an empty search query
Fixes #793
2014-10-13 14:04:19 +01:00
Tom Hughes
dae66c21d5 Update to CPK 7.0.11 and drop monkey patch 2014-10-10 12:32:25 +01:00
John Firebaugh
407b7d717d Update to iD v1.6.0 2014-10-06 15:10:25 -07:00
John Firebaugh
963827d396 Forward the comment hash parameter to iD
See 21da76cf80
2014-10-06 14:47:36 -07:00
Siebrand Mazeland
4e976c835a Localisation updates from https://translatewiki.net. 2014-10-06 12:11:58 +02:00
Tom Hughes
574220187b Test that reserved usernames are not allowed 2014-10-02 19:54:26 +01:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Tom Hughes
c83778df8c Ban usernames which match special URLs
Trac #5236
2014-10-02 13:37:26 +01:00
Paul Norman
e2c81091a0 Explain how to load data for testing
This is a fairly common query, and not too complicated where the data only needs to be loaded.

Loading data then editing it is more complex, and not covered here.
2014-09-08 17:12:10 -07:00
Tom Hughes
1e1baa33ad Move noscript message clear of the sidebar
Fixes #808
2014-09-07 13:48:28 +01:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01:00
Paul Norman
2d26d1f764 Add an imagery blacklist to capabilities
This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.

This adds a <policy> element to the capabilities XML which contains the
blacklist information within it
2014-08-31 18:41:12 +01:00
Tom Hughes
ace4da4f82 Move ICO favion into an IE conditional comment 2014-08-19 10:55:01 +01:00
Tom Hughes
ebe82bbb5d Update to rails 4.1.5 2014-08-19 09:26:34 +01:00
Siebrand Mazeland
821c2fa2d8 Localisation updates from https://translatewiki.net. 2014-08-10 11:46:50 +02:00
Tom Hughes
04948fff0c Addd some missing quotes 2014-08-10 08:55:06 +01:00
Siebrand Mazeland
befd09bc2a Localisation updates from https://translatewiki.net. 2014-08-09 16:21:12 +02:00
Martijn van Exel
76edbe9b4f adding detail to configure.md 2014-08-07 15:38:32 -06:00
Tom Hughes
3ab24d63f0 Revert "Localisation updates from https://translatewiki.net."
This reverts commit e25fbfa13a.
2014-08-06 16:04:13 +01:00
Siebrand Mazeland
e25fbfa13a Localisation updates from https://translatewiki.net. 2014-08-06 16:50:27 +02:00
Tom Hughes
2e29168986 Precompile expressInstall.swf 2014-08-06 08:58:47 +01:00
Tom Hughes
b6af236b05 Update Potlatch 2 to 2.3-632-g1a1f24a build 2014-08-06 08:53:03 +01:00
Tom Hughes
7c75767c9b Restore original limits for user lists in statistics 2014-08-05 09:24:20 +01:00
John Firebaugh
b10dd0949d Update to iD v1.5.4 2014-07-29 11:13:03 -07:00
Tom Hughes
042ecee695 Don't preload the nodes as it seems to break the ordering
Fixes #795
2014-07-29 10:14:08 +01:00
Tom Hughes
965fb0b3ae Revert "Fix off-by-one error in user notes list"
This reverts commit 706454ae35.
2014-07-26 10:34:57 +01:00
Tom Hughes
87d9ef8ea5 Use autoprefixer to generate CSS prefixes 2014-07-25 19:38:03 +01:00
Tom Hughes
3ca29a8dc7 Precompile iD locales 2014-07-25 18:44:57 +01:00
John Firebaugh
3f6d40c092 Update to iD v1.5.3 2014-07-25 10:07:14 -07:00
Tom Hughes
204486e824 More modernisations for the statistics script 2014-07-25 16:49:40 +01:00
Tom Hughes
ace29736c7 Modernise statistics script to work with rails 4.1 2014-07-25 16:40:53 +01:00
Toby Murray
706454ae35 Fix off-by-one error in user notes list 2014-07-24 22:30:36 +01:00
Florian M. Schäfer
f8fccbf8be Let test_note_event pass in timezones other than +00:00 2014-07-24 22:27:16 +01:00