Merge branch 'master' of https://github.com/maxious/ACTBus-ui
author Alexander Sadleir
()
committer Alexander Sadleir
()
commit 4aab11cb185fdfa17409d8512b881d5d6e9c9093
tree 3664055f6bfc325d2eeb70c10c47bc2dbc1e774f
parent 7cfc800a9181a84676e5e33ff428664dc47b4c2b
parent 9714b3c938ad66f914c8d22144b8883e40f2ef09
Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
.gitmodules
myway/myway_timeliness_route.json.php
myway/myway_timeliness_stop.php
446 files changed:
.gitmodules
about.php
aws/transitdata.sql [ deleted file ]
css/jquery-ui-1.8.12.custom.css
css/jquery.mobile-b90eab4935.css [ deleted file ]
css/local.css.php
feedback.php
include/common-geo.inc.php
include/common-request.inc.php
include/common-template.inc.php
include/common-transit.inc.php
include/common.inc.php
include/db/route-dao.inc.php
include/db/servicealert-dao.inc.php
include/db/stop-dao.inc.php
include/db/trip-dao.inc.php
index.php
js/LAB.min.js [ deleted file ]
js/jquery-1.6.4.min.js [ deleted file ]
js/jquery.mobile-b90eab4935.js [ deleted file ]
js/yepnope [ new directory with mode 0000 ]
labs/OpenStreetMap.js [ deleted file ]
labs/busstopdensity.php [ deleted file ]
labs/busstopdensity.tile.php [ deleted file ]
labs/googlemaps.php [ deleted file ]
labs/gradient/classic.png [ deleted file ]
labs/gradient/fire.png [ deleted file ]
labs/gradient/pgaitch.png [ deleted file ]
labs/openlayers/OpenLayers.js [ deleted file ]
labs/openlayers/build/README.txt [ deleted file ]
labs/openlayers/build/build.py [ deleted file ]
labs/openlayers/build/buildUncompressed.py [ deleted file ]
labs/openlayers/build/full.cfg [ deleted file ]
labs/openlayers/build/library.cfg [ deleted file ]
labs/openlayers/build/license.txt [ deleted file ]
labs/openlayers/build/lite.cfg [ deleted file ]
labs/openlayers/img/blank.gif [ deleted file ]
labs/openlayers/img/cloud-popup-relative.png [ deleted file ]
labs/openlayers/img/drag-rectangle-off.png [ deleted file ]
labs/openlayers/img/drag-rectangle-on.png [ deleted file ]
labs/openlayers/img/east-mini.png [ deleted file ]
labs/openlayers/img/layer-switcher-maximize.png [ deleted file ]
labs/openlayers/img/layer-switcher-minimize.png [ deleted file ]
labs/openlayers/img/marker-blue.png [ deleted file ]
labs/openlayers/img/marker-gold.png [ deleted file ]
labs/openlayers/img/marker-green.png [ deleted file ]
labs/openlayers/img/marker.png [ deleted file ]
labs/openlayers/img/measuring-stick-off.png [ deleted file ]
labs/openlayers/img/measuring-stick-on.png [ deleted file ]
labs/openlayers/img/north-mini.png [ deleted file ]
labs/openlayers/img/panning-hand-off.png [ deleted file ]
labs/openlayers/img/panning-hand-on.png [ deleted file ]
labs/openlayers/img/slider.png [ deleted file ]
labs/openlayers/img/south-mini.png [ deleted file ]
labs/openlayers/img/west-mini.png [ deleted file ]
labs/openlayers/img/zoom-minus-mini.png [ deleted file ]
labs/openlayers/img/zoom-plus-mini.png [ deleted file ]