Commit graph

512 commits

Author SHA1 Message Date
Tom Hughes
fd0d21dea0 Update Potlatch 2 to 2.4-21-g233799c build 2016-02-07 14:32:03 +00:00
Bryan Housel
cb43e6af9e Update to iD v1.8.5 2016-01-18 10:38:19 -05:00
Bryan Housel
5ffdceeb4d Update to iD v1.8.4 2016-01-06 17:51:49 -05:00
Tom Hughes
3babcd9fe1 Update Potlatch 2 to 2.4-16-g0c126d0 build 2015-12-16 16:21:09 +00:00
Bryan Housel
8c38faa90e Update to iD v1.8.3 2015-12-11 13:28:26 -08:00
Bryan Housel
e5c4822d2c Update to iD v1.8.2 2015-12-10 18:02:52 -08:00
Tom Hughes
0d2e1608ba Enable https for humanitarian layer 2015-12-07 15:59:13 +00:00
Bryan Housel
db78390ef3 Update to iD v1.8.0 2015-11-07 23:18:03 -05:00
Tom Hughes
2b015ff522 Update leaflet to 0.7.7 2015-10-26 15:48:43 +00:00
Tom Hughes
1dbc655235 Update Potlatch 2 to 2.4-12-g7158c69 build 2015-09-28 08:38:02 +01:00
Bryan Housel
92d284a678 Update to iD v1.7.4 2015-09-16 00:02:51 -04:00
Tom Hughes
e3de1c4572 Update to Leaflet 0.7.5 2015-09-02 19:05:24 +01:00
Tom Hughes
9ceb077afc Update to Leaflet 0.7.4 2015-09-01 19:08:44 +01:00
Dan Stowell
0fa051fb40 Move leaflet.contextmenu 3rd party code to "vendor" folder 2015-08-17 08:55:48 +01:00
Tom Hughes
bd1a466f21 Update jquery.cookie 2015-08-13 17:00:44 +01:00
Tom Hughes
05fb8b3e00 Update leaflet polyline plugin 2015-08-13 16:59:27 +01:00
Tom Hughes
ea4e33efa8 Update html5shiv to 3.7.3 2015-08-13 16:56:07 +01:00
Tom Hughes
6f5acd26e8 Enable https for thunderforest layers 2015-08-13 16:55:37 +01:00
Tom Hughes
674aef0d3f Update Potlatch 2 to 2.4-4-g37a0924 build 2015-07-05 13:17:24 +01:00
Bryan Housel
92384ed956 Update to iD v1.7.3 2015-06-10 11:53:10 -04:00
Bryan Housel
2ac8b4b760 Update to iD v1.7.2 2015-05-03 10:30:14 -04:00
Bryan Housel
f36fc22e1a Update to iD v1.7.1 2015-04-30 14:42:10 -04:00
Tom Hughes
e0c9b2e7fe Update bootstrap code 2015-03-09 22:30:54 +00:00
Tom Hughes
9d6c3c211f Remove empty locales from iD
https://github.com/openstreetmap/iD/issues/2528
2015-02-26 08:58:43 +00:00
Tom Hughes
eaf4b32a7f Rework OpenID tests for new flows using OmniAuth mocking 2015-02-25 01:07:23 +00:00
Tom Hughes
1596713871 Fix some JSHint complaints 2015-02-23 21:45:57 +00:00
Tom Hughes
2cb166cf33 Move querystring.js to vendor tree 2015-02-23 21:45:56 +00:00
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