Commit graph

6860 commits

Author SHA1 Message Date
Richard Fairhurst
e94f251de5 Merge pull request #25 from zerebubuth/routing-ui-tweaks
Routing UI tweaks
2014-11-12 18:32:04 +00:00
Tom Hughes
89af923605 Stringify user ID 2014-11-12 09:44:21 +00:00
Matt Amos
91930aa4a5 Consolidated list highlight colours to one parameter. 2014-11-10 20:05:54 +00:00
Matt Amos
e3062aa794 Made top & bottom spacing in directions list consistent. 2014-11-10 19:59:02 +00:00
Matt Amos
4734b9ce5d Added some vertical space in the routing text input boxes. 2014-11-10 19:36:43 +00:00
Matt Amos
3a9db4cf30 Use buttons for switching to/from directions.
Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.
2014-11-10 19:17:21 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
2014-11-10 16:14:06 +00:00
Tom Hughes
f0ecc6312b Revert "Add SOTM advert"
This reverts commit 15a7276a9f.
2014-11-09 23:03:04 +00:00
Tom Hughes
ac2f9308b9 Update to rails 4.1.7 2014-11-09 22:41:12 +00:00
Tom Hughes
08a0fc90e3 Track users in piwik 2014-11-09 22:41:01 +00:00
Tom Hughes
4abb666ef0 Handle unknown admin_level values 2014-11-07 19:17:34 +00:00
Tom Hughes
526ff06172 Allow query mode to be turned off at low zoom
Fixes #830
2014-11-07 15:58:05 +00:00
Tom Hughes
2992564276 Look for locale specific names 2014-11-07 15:19:30 +00:00
Tom Hughes
cddec72be5 Don't do the admin boundary special case unless admin_level is set 2014-11-07 15:00:22 +00:00
Tom Hughes
e11d734f9f Merge branch 'overpass' 2014-11-07 08:40:18 +00:00
Paul Norman
295c4f6992 Recommend PostgreSQL 9.1+ in database.yml
Postgres 8.3 is EOL and the minimum version supported by PostgreSQL
is 9.0. The production servers run 9.1, and the extension setup is
easier with it too.
2014-11-07 08:24:26 +00:00
Paul Norman
4877799160 Link to Phusion Passenger docs for production
Phusion Passenger has documentation for common web servers, so we can
link to them, as most users will be using one of them in production.
2014-11-07 08:23:47 +00:00
Paul Norman
758e6da9a8 Add KSJ2 tags to uninteresting list
The KSJ2 tags often appear on nodes with no interesting tags
as import cruft.
2014-11-07 08:20:40 +00:00
Tom Hughes
6b09732854 Don't enable query mode when loading a query URL 2014-11-05 21:03:14 +00:00
Tom Hughes
260a690b3d Add comments_feed action to various filters
Fixes #825
2014-11-05 20:34:45 +00:00
Tom Hughes
e78ab8d0d6 Allow query mode to be disabled when the sidebar is open 2014-11-05 13:57:52 +00:00
Dan Stowell
a474c095fd Leave overpass result links coloured blue
Closes #47.
2014-11-05 09:30:09 +00:00
Tom Hughes
9c7e0e13d7 Sort enclosing features by size 2014-11-04 10:24:36 +00:00
Dan Karran
0440984bc7 Add some missing browse icons
Icons for highway=tertiary, highway=track, highway=path and barrier=wall.
2014-11-04 09:56:59 +00:00
Richard Fairhurst
1f7bd08f4a Merge pull request #24 from zerebubuth/routing-merge
Routing merge
2014-11-03 11:33:08 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
2014-11-03 11:08:13 +00:00
Tom Hughes
c4746efdb5 Don't centre on load if the location is already in view 2014-11-01 17:55:21 +00:00
Tom Hughes
9b26dc79c6 Use new overpass geometry output support to get geometeries 2014-11-01 17:55:21 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
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