knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:okfn/recline

Browse Source
This commit is contained in:
Rufus Pollock
2014-09-14 00:20:10 +01:00
parent d716a65fd2 07a17cce24
commit fffccef123
26 changed files with 9691 additions and 8089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/index.html
View File

@@ -8,7 +8,7 @@
<link rel="stylesheet" href="../css/timeline.css" type="text/css" media="screen" />
<style type="text/css">.recline-timeline { height: 400px; }</style>
<link rel="stylesheet" href="../css/flot.css">
<link rel="stylesheet" href="../vendor/leaflet/0.4.4/leaflet.css">
<link rel="stylesheet" href="../vendor/leaflet/0.7.3/leaflet.css">
<link rel="stylesheet" href="../vendor/leaflet.markercluster/MarkerCluster.css">
<link rel="stylesheet" href="../vendor/leaflet.markercluster/MarkerCluster.Default.css">
<link rel="stylesheet" href="../css/map.css">
@@ -21,7 +21,7 @@
<script type="text/javascript" src="../vendor/bootstrap/2.3.2/bootstrap.js"></script>
<script type="text/javascript" src="../vendor/flot/jquery.flot.js"></script>
<script type="text/javascript" src="../vendor/flot/jquery.flot.time.js"></script>
<script type="text/javascript" src="../vendor/leaflet/0.4.4/leaflet-src.js"></script>
<script type="text/javascript" src="../vendor/leaflet/0.7.3/leaflet-src.js"></script>
<script type="text/javascript" src="../vendor/leaflet.markercluster/leaflet.markercluster.js"></script>
<script type="text/javascript" src="../vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="../vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js"></script>