Commit graph

303 commits

Author SHA1 Message Date
Tom Hughes
b095b59d5e Merge remote-tracking branch 'origin/master' into routing
Conflicts:
	app/views/layouts/_search.html.erb
2014-03-08 17:44:22 +00:00
Tom Hughes
1e45b8f521 Update to Leaflet 0.7.2 2014-03-04 15:53:40 +00:00
John Firebaugh
e50229c0bc Update to iD v1.3.7 2014-02-26 00:33:48 +00:00
Tom Hughes
a7f9ca32b7 Fix some mixed content issues 2014-02-08 17:43:34 +00:00
John Firebaugh
b76bfe379e Update to iD v1.3.6 2014-02-05 18:39:54 +00:00
Richard Fairhurst
2198b6ebbf Beginning of JavaScript-only routing UI 2014-01-21 13:29:05 +00:00
John Firebaugh
65b009ea32 Update to iD v1.3.5 2014-01-10 19:24:08 +00:00
Tom Hughes
54608122bb Update jquery.cookie 2013-12-11 00:12:39 +00:00
Tom Hughes
8af565b293 Reapply leaflet.locate patch 2013-12-06 19:40:54 +00:00
Tom Hughes
a2e06ea667 Update leaflet.locate 2013-12-06 19:40:31 +00:00
Tom Hughes
ba1268ead6 Update to Leaflet 0.7.1 2013-12-06 16:24:36 +00:00
Tom Hughes
77b4ff6ceb Use jQuery Simulate to simulate click events 2013-12-03 00:29:23 +00:00
Tom Hughes
68a3df4d53 Merge branch 'redesign'
Conflicts:
	app/assets/stylesheets/common.css.scss
2013-11-28 17:30:53 +00:00
John Firebaugh
edfd358289 Update to iD v1.3.4 2013-11-26 19:34:53 -08:00
John Firebaugh
d967a4efc0 Update to iD v1.3.3 2013-11-22 16:52:42 -08:00
John Firebaugh
44629832dd Merge branch 'master' into redesign
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
2013-11-19 09:42:47 -08:00
Tom Hughes
3bee80e0dc Update to latest leaflet-locationfilter plugin 2013-11-18 17:43:46 +00:00
Tom Hughes
049093c5b4 Update to latest leaflet-osm plugin 2013-11-18 17:43:46 +00:00
Tom Hughes
f3895c8fab Update to latest Leaflet-hash plugin 2013-11-18 17:43:46 +00:00
Tom Hughes
214ff28cd9 Update to Leaflet 0.7 2013-11-18 17:43:46 +00:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
2013-11-15 16:47:49 -08:00
John Firebaugh
b92cb5b772 Use html5shiv for IE8 compatibility 2013-11-15 10:46:56 -08:00
John Firebaugh
ad368d189f Update to iD v1.3.2 2013-11-14 18:07:45 -08:00
John Firebaugh
e8c02b49e4 Patch Leaflet bug
This has already been fixed for the next release.
2013-11-12 16:59:27 -08:00
John Firebaugh
1082d3a653 preserve visual center of map on sidebar transitions 2013-11-11 14:42:59 -08:00
John Firebaugh
a805e0b545 Use our own hash implementation
We need more flexibility than L.Hash provides.
2013-11-11 14:42:59 -08:00
John Firebaugh
24eb15b0c3 Update to iD v1.3.1 2013-10-26 16:56:43 -07:00
John Firebaugh
45d9e051f5 Update to iD v1.3.0 2013-10-24 09:12:36 -07:00
John Firebaugh
637799f1f5 Fix export location filter button
Upstream pull request:
https://github.com/kajic/leaflet-locationfilter/pull/14
2013-10-13 14:46:10 -07:00
John Firebaugh
99775524b3 Fix display of browsed objects on map 2013-10-13 14:45:58 -07:00
John Firebaugh
1104165e7b Update to iD v1.2.1 2013-10-01 19:35:12 +01:00
John Firebaugh
76d8bed5d1 Update to iD v1.2.0 2013-09-26 10:21:52 -07:00
Tom Hughes
b756c5fd6e Add HOT layer to the main page 2013-09-23 17:50:06 +01:00
Tom Hughes
ead9695fb6 Fix sizing of scale control 2013-09-13 16:02:38 +01:00
John Firebaugh
fa6bbcee47 Update to iD v1.1.6 2013-08-24 09:23:38 -07:00
John Firebaugh
d23f262543 Update to iD v1.1.5 2013-08-23 14:35:27 -07:00
John Firebaugh
1727cd7c2b Compact user menu 2013-08-21 17:20:04 -07:00
Tom Hughes
e71c904912 Update Potlatch 2 to 2.3-605-gbec0ea7 build 2013-08-20 13:10:52 +01:00
Tom Hughes
f5fac5d5e3 Update Potlatch 2 to 2.3-603-gebdfa12 build 2013-08-20 12:30:54 +01:00
John Firebaugh
4995714644 Update to iD 1.1.4 2013-08-17 13:00:55 -07:00
John Firebaugh
2fed3f0d6b Update to iD v1.1.3 2013-08-16 00:03:15 +01:00
Grant Slater
0aa32990d5 Tweak layer levels 2013-08-14 00:31:37 +01:00
John Firebaugh
a45af012b4 Update to iD v1.1.2 2013-08-12 14:20:01 -07:00
John Firebaugh
25792ba304 iD 1.1.1 2013-08-10 00:38:46 +01:00
John Firebaugh
78e97ade45 iD 1.1.0 2013-08-10 00:38:36 +01:00
John Firebaugh
dc877c3d03 Reapply patch 2013-08-08 14:26:36 -07:00
John Firebaugh
1b2738af80 Update leaflet.locate (fixes #438) 2013-08-08 14:26:14 -07:00
John Firebaugh
54ded37bf2 Tooltips for map controls 2013-08-07 15:41:32 -07:00
Tom Hughes
4a97b04179 Update Potlatch 2 to 2.3-596-gc119528 build 2013-08-06 12:26:20 +01:00
John Firebaugh
406e93de95 Port fix for Leaflet issue #1919 2013-08-05 14:30:50 -07:00