language:
Deutsch (de_DE)
English (en_US)
Español (es_ES)
Français (fr_FR)
Italiano (it_IT)
日本語 (ja_JP)
Русский (ru_RU)
Türkçe (tr_TR)
中文简体 (zh_CN)
projects
/
busui.git
/ commitdiff
commit
author
committer
file
search:
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
unified
|
plain
Merge branch 'master' of https://github.com/maxious/ACTBus-ui
Merge branch 'master' of https://github.com/maxious/ACTBus-ui
Conflicts:
.gitmodules
myway/myway_timeliness_route.json.php
myway/myway_timeliness_stop.php
505 files changed:
(show all)
.gitmodules (new)
about.php
aws/awsStartup.sh (deleted)
aws/busuidb.sh (deleted)
aws/busuiotp.sh (deleted)
aws/busuiotp.testing.sh (deleted)
aws/busuiphp.sh (deleted)
aws/compress.conf (deleted)
aws/data-sources.xml (deleted)
aws/expire.conf (deleted)
aws/fastcgi.conf (deleted)
aws/modules.conf (deleted)
aws/pg_hba.conf (deleted)
aws/php.ini (deleted)
aws/postgresql.conf (deleted)
aws/rc.local (deleted)
aws/transitdata.sql (deleted)
css/jquery-ui-1.8.12.custom.css
css/jquery.mobile-b90eab4935.css (deleted)
css/local.css.php
feedback.php
geo/route.kml.php
geo/stops.kml.php
geo/trip.kml.php (new)
include/common-auth.inc.php
include/common-db.inc.php
include/common-geo.inc.php
include/common-net.inc.php
include/common-request.inc.php
include/common-session.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/FlashCanvas (new)
js/LAB.min.js (deleted)
js/flot/excanvas.js (deleted)
js/flot/excanvas.min.js (deleted)
js/flot/jquery.colorhelpers.js (deleted)
js/flot/jquery.colorhelpers.min.js (deleted)
js/flot/jquery.flot.crosshair.js (deleted)
js/flot/jquery.flot.crosshair.min.js (deleted)
js/flot/jquery.flot.fillbetween.js (deleted)
js/flot/jquery.flot.fillbetween.min.js (deleted)
js/flot/jquery.flot.image.js (deleted)
js/flot/jquery.flot.image.min.js (deleted)
js/flot/jquery.flot.js (deleted)
js/flot/jquery.flot.min.js (deleted)
js/flot/jquery.flot.navigate.js (deleted)
js/flot/jquery.flot.navigate.min.js (deleted)
js/flot/jquery.flot.pie.js (deleted)
js/flot/jquery.flot.pie.min.js (deleted)
js/flot/jquery.flot.resize.js (deleted)
js/flot/jquery.flot.resize.min.js (deleted)
js/flot/jquery.flot.selection.js (deleted)
js/flot/jquery.flot.selection.min.js (deleted)
js/flot/jquery.flot.stack.js (deleted)
js/flot/jquery.flot.stack.min.js (deleted)
js/flot/jquery.flot.symbol.js (deleted)
js/flot/jquery.flot.symbol.min.js (deleted)
js/flot/jquery.flot.threshold.js (deleted)
js/flot/jquery.flot.threshold.min.js (deleted)
js/flotr2 (new)
js/jquery-1.6.4.min.js (deleted)
js/jquery.mobile-b90eab4935.js (deleted)
js/yepnope (new)
labs/OpenStreetMap.js (deleted)
labs/busstopdensity.php (deleted)
labs/busstopdensity.tile.php (deleted)
labs/googlemaps.php (deleted)
labs/gradient/classic.png (deleted)
labs/gradient/fire.png (deleted)
labs/gradient/pgaitch.png (deleted)
labs/openlayers/OpenLayers.js (deleted)
labs/openlayers/build/README.txt (deleted)
labs/openlayers/build/build.py (deleted)
labs/openlayers/build/buildUncompressed.py (deleted)
labs/openlayers/build/full.cfg (deleted)
labs/openlayers/build/library.cfg (deleted)
labs/openlayers/build/license.txt (deleted)
labs/openlayers/build/lite.cfg (deleted)
labs/openlayers/img/blank.gif (deleted)
labs/openlayers/img/cloud-popup-relative.png (deleted)
labs/openlayers/img/drag-rectangle-off.png (deleted)
labs/openlayers/img/drag-rectangle-on.png (deleted)
labs/openlayers/img/east-mini.png (deleted)
labs/openlayers/img/layer-switcher-maximize.png (deleted)
labs/openlayers/img/layer-switcher-minimize.png (deleted)
labs/openlayers/img/marker-blue.png (deleted)
labs/openlayers/img/marker-gold.png (deleted)
labs/openlayers/img/marker-green.png (deleted)
labs/openlayers/img/marker.png (deleted)
labs/openlayers/img/measuring-stick-off.png (deleted)
labs/openlayers/img/measuring-stick-on.png (deleted)
labs/openlayers/img/north-mini.png (deleted)
labs/openlayers/img/panning-hand-off.png (deleted)
labs/openlayers/img/panning-hand-on.png (deleted)
labs/openlayers/img/slider.png (deleted)
labs/openlayers/img/south-mini.png (deleted)
labs/openlayers/img/west-mini.png (deleted)
labs/openlayers/img/zoom-minus-mini.png (deleted)
labs/openlayers/img/zoom-plus-mini.png (deleted)
labs/openlayers/img/zoom-world-mini.png (deleted)
labs/openlayers/img/zoombar.png (deleted)
labs/openlayers/lib/Firebug/errorIcon.png (deleted)
labs/openlayers/lib/Firebug/firebug.css (deleted)
labs/openlayers/lib/Firebug/firebug.html (deleted)
labs/openlayers/lib/Firebug/firebug.js (deleted)
labs/openlayers/lib/Firebug/firebugx.js (deleted)
labs/openlayers/lib/Firebug/infoIcon.png (deleted)
labs/openlayers/lib/Firebug/license.txt (deleted)
labs/openlayers/lib/Firebug/readme.txt (deleted)
labs/openlayers/lib/Firebug/warningIcon.png (deleted)
labs/openlayers/lib/Gears/gears_init.js (deleted)
labs/openlayers/lib/OpenLayers.js (deleted)
labs/openlayers/lib/OpenLayers/Ajax.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/Class.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/Element.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/LonLat.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/Pixel.js (deleted)
labs/openlayers/lib/OpenLayers/BaseTypes/Size.js (deleted)
labs/openlayers/lib/OpenLayers/Console.js (deleted)
labs/openlayers/lib/OpenLayers/Control.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ArgParser.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Attribution.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Button.js (deleted)
labs/openlayers/lib/OpenLayers/Control/DragFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/DragPan.js (deleted)
labs/openlayers/lib/OpenLayers/Control/DrawFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/EditingToolbar.js (deleted)
labs/openlayers/lib/OpenLayers/Control/GetFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Graticule.js (deleted)
labs/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js (deleted)
labs/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Measure.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ModifyFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/MouseDefaults.js (deleted)
labs/openlayers/lib/OpenLayers/Control/MousePosition.js (deleted)
labs/openlayers/lib/OpenLayers/Control/MouseToolbar.js (deleted)
labs/openlayers/lib/OpenLayers/Control/NavToolbar.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Navigation.js (deleted)
labs/openlayers/lib/OpenLayers/Control/NavigationHistory.js (deleted)
labs/openlayers/lib/OpenLayers/Control/OverviewMap.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Pan.js (deleted)
labs/openlayers/lib/OpenLayers/Control/PanPanel.js (deleted)
labs/openlayers/lib/OpenLayers/Control/PanZoom.js (deleted)
labs/openlayers/lib/OpenLayers/Control/PanZoomBar.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Panel.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Permalink.js (deleted)
labs/openlayers/lib/OpenLayers/Control/SLDSelect.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Scale.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ScaleLine.js (deleted)
labs/openlayers/lib/OpenLayers/Control/SelectFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Snapping.js (deleted)
labs/openlayers/lib/OpenLayers/Control/Split.js (deleted)
labs/openlayers/lib/OpenLayers/Control/TransformFeature.js (deleted)
labs/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js (deleted)
labs/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ZoomBox.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ZoomIn.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ZoomOut.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ZoomPanel.js (deleted)
labs/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js (deleted)
labs/openlayers/lib/OpenLayers/Events.js (deleted)
labs/openlayers/lib/OpenLayers/Feature.js (deleted)
labs/openlayers/lib/OpenLayers/Feature/Vector.js (deleted)
labs/openlayers/lib/OpenLayers/Feature/WFS.js (deleted)
labs/openlayers/lib/OpenLayers/Filter.js (deleted)
labs/openlayers/lib/OpenLayers/Filter/Comparison.js (deleted)
labs/openlayers/lib/OpenLayers/Filter/FeatureId.js (deleted)
labs/openlayers/lib/OpenLayers/Filter/Logical.js (deleted)
labs/openlayers/lib/OpenLayers/Filter/Spatial.js (deleted)
labs/openlayers/lib/OpenLayers/Format.js (deleted)
labs/openlayers/lib/OpenLayers/Format/ArcXML.js (deleted)
labs/openlayers/lib/OpenLayers/Format/ArcXML/Features.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Atom.js (deleted)
labs/openlayers/lib/OpenLayers/Format/CSWGetDomain.js (deleted)
labs/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js (deleted)
labs/openlayers/lib/OpenLayers/Format/CSWGetRecords.js (deleted)
labs/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Context.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Filter.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Filter/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GML.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GML/Base.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GML/v2.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GML/v3.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GPX.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GeoJSON.js (deleted)
labs/openlayers/lib/OpenLayers/Format/GeoRSS.js (deleted)
labs/openlayers/lib/OpenLayers/Format/JSON.js (deleted)
labs/openlayers/lib/OpenLayers/Format/KML.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OSM.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OWSContext.js (deleted)
labs/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SLD.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SLD/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SOSCapabilities.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js (deleted)
labs/openlayers/lib/OpenLayers/Format/SOSGetObservation.js (deleted)
labs/openlayers/lib/OpenLayers/Format/Text.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFS.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFST.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFST/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WKT.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMC.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMC/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js (deleted)
labs/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js (deleted)
labs/openlayers/lib/OpenLayers/Format/XML.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/Collection.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/Curve.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/LineString.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/LinearRing.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/MultiLineString.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/MultiPoint.js (deleted)
labs/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js (deleted)