Tom Hughes
|
250bb47cc2
|
Merge remote-tracking branch 'systemed/routing'
|
2015-02-16 08:30:29 +00:00 |
|
Bryan Housel
|
2dd2b1a6eb
|
fix version in iD.js
|
2015-02-12 06:37:53 -05:00 |
|
Bryan Housel
|
59a5b6d1c6
|
Update to iD v1.7.0
|
2015-02-12 05:41:04 -05:00 |
|
Tom Hughes
|
8adb0846b4
|
Update to latest upstream polyline decoder
|
2015-02-01 15:09:15 +00:00 |
|
Matt Amos
|
c3e2e6462f
|
Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2
Conflicts:
config/locales/de.yml
|
2015-01-26 13:14:58 +00:00 |
|
Tom Hughes
|
716846b480
|
Update Potlatch 2 to 2.3-650-gad99430 build
|
2014-12-20 11:41:47 +00:00 |
|
Tom Hughes
|
a994f5df0b
|
Update ohauth
|
2014-11-18 17:58:45 +00:00 |
|
Tom Hughes
|
557dcd8614
|
Update jQuery plugins
|
2014-11-18 17:57:21 +00:00 |
|
Tom Hughes
|
ab671bd1e1
|
Update html5shiv
|
2014-11-18 17:57:09 +00:00 |
|
Tom Hughes
|
33bcb2e088
|
Update attribution for embedded maps
Fixes #838
|
2014-11-18 17:41:45 +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 |
|
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
|
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
|
366ba78901
|
Update Potlatch 2 to 2.3-645-g81e8bcb build
|
2014-10-14 11:10:06 +01:00 |
|
John Firebaugh
|
407b7d717d
|
Update to iD v1.6.0
|
2014-10-06 15:10:25 -07:00 |
|
Tom Hughes
|
b6af236b05
|
Update Potlatch 2 to 2.3-632-g1a1f24a build
|
2014-08-06 08:53:03 +01:00 |
|
John Firebaugh
|
b10dd0949d
|
Update to iD v1.5.4
|
2014-07-29 11:13:03 -07:00 |
|
John Firebaugh
|
3f6d40c092
|
Update to iD v1.5.3
|
2014-07-25 10:07:14 -07:00 |
|
John Firebaugh
|
b194a3bf96
|
Update to iD v1.5.2
|
2014-07-15 16:53:21 -07:00 |
|
John Firebaugh
|
d9521aeeb9
|
Update to iD v1.5.1
|
2014-07-10 10:13:01 -07:00 |
|
Aaron Lidman
|
542c45db01
|
Update to iD v1.5.0
|
2014-07-08 20:07:33 -04:00 |
|
Tom Hughes
|
04d9335f3c
|
Update to latest leaflet-osm plugin
|
2014-06-25 18:54:12 +01:00 |
|
John Firebaugh
|
1031af3177
|
Update to iD v1.4.0
|
2014-06-04 10:48:14 +01:00 |
|
Tom Hughes
|
945da7a06f
|
Update to latest leaflet-locationfilter plugin
|
2014-05-23 10:48:39 +01:00 |
|
Tom Hughes
|
3ca85f2ac5
|
Reapply leaflet.locate patch
|
2014-05-23 10:47:48 +01:00 |
|
Tom Hughes
|
8b182b5c70
|
Update leaflet.locate
|
2014-05-23 10:45:38 +01:00 |
|
Tom Hughes
|
e42d840ddb
|
Update to Leaflet 0.7.3
|
2014-05-23 10:43:43 +01:00 |
|
John Firebaugh
|
2f6165e040
|
Update to iD v1.3.10
|
2014-05-21 22:59:52 +01:00 |
|
John Firebaugh
|
76c6409b67
|
Update to iD v1.3.9
|
2014-04-09 15:07:54 -04:00 |
|
John Firebaugh
|
5c58f00c2e
|
Update to iD v1.3.8
|
2014-03-28 11:59:03 -07:00 |
|
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 |
|