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 /var/www/busui
Merge /var/www/busui
Conflicts:
index.php
487 files changed:
(show all)
about.php
aws/awsStartup.sh
aws/pg_hba.conf (new)
aws/postgresql.conf (new)
css/images/01-refresh.png (deleted)
css/images/02-redo.png (deleted)
css/images/06-magnify.png (deleted)
css/images/07-map-marker.png (deleted)
css/images/101-gameplan.png (deleted)
css/images/102-walk.png (deleted)
css/images/103-map.png (deleted)
css/images/121-landscape.png (deleted)
css/images/13-target.png (deleted)
css/images/139-flags.png (deleted)
css/images/145-persondot.png (deleted)
css/images/184-warning.png (deleted)
css/images/193-location-arrow.png (deleted)
css/images/28-star.png (deleted)
css/images/53-house.png (deleted)
css/images/55-network.png (deleted)
css/images/57-download.png (deleted)
css/images/58-bookmark.png (deleted)
css/images/59-flag.png (deleted)
css/images/60-signpost.png (deleted)
css/images/73-radar.png (deleted)
css/images/74-location.png (deleted)
css/images/83-calendar.png (deleted)
css/images/91-beaker-2.png (new)
css/jquery-mobile-1.0a3.css (deleted)
css/jquery.mobile-1.0a4.css (new)
dotcloud/postinstall (new)
dotcloud/push.sh (new)
feedback.php
include/common-db.inc.php (new)
include/common-geo.inc.php
include/common-net.inc.php
include/common-session.inc.php (new)
include/common-template.inc.php
include/common-transit.inc.php
include/common.inc.php
include/db/route-dao.inc.php (new)
include/db/stop-dao.inc.php (new)
include/db/trip-dao.inc.php (new)
index.php
js/flotr/flotr-0.2.0-alpha.js (new)
js/flotr/flotr.debug-0.2.0-alpha_radar1.js (new)
js/flotr/lib/base64.js (new)
js/flotr/lib/canvas2image.js (new)
js/flotr/lib/canvastext.js (new)
js/flotr/lib/excanvas.js (new)
js/flotr/lib/prototype-1.6.0.2.js (new)
js/jquery-1.5.js
js/jquery-mobile-1.0a3.js (deleted)
js/jquery.mobile-1.0a4.js (new)
labs/OpenStreetMap.js (new)
labs/about.php (new)
labs/busstopdensity.php (new)
labs/busstopdensity.tile.php (new)
labs/css (new)
labs/feedback.php (new)
labs/googlemaps.php (new)
labs/gradient/classic.png (new)
labs/gradient/fire.png (new)
labs/gradient/pgaitch.png (new)
labs/index.php (new)
labs/js (new)
labs/lib (new)
labs/myway_api.json.php (new)
labs/mywaybalance.php (new)
labs/networkstats.php (new)
labs/openlayers/OpenLayers.js (new)
labs/openlayers/build/README.txt (new)
labs/openlayers/build/build.py (new)
labs/openlayers/build/buildUncompressed.py (new)
labs/openlayers/build/full.cfg (new)
labs/openlayers/build/library.cfg (new)
labs/openlayers/build/license.txt (new)
labs/openlayers/build/lite.cfg (new)
labs/openlayers/img/blank.gif (new)
labs/openlayers/img/cloud-popup-relative.png (new)
labs/openlayers/img/drag-rectangle-off.png (new)
labs/openlayers/img/drag-rectangle-on.png (new)
labs/openlayers/img/east-mini.png (new)
labs/openlayers/img/layer-switcher-maximize.png (new)
labs/openlayers/img/layer-switcher-minimize.png (new)
labs/openlayers/img/marker-blue.png (new)
labs/openlayers/img/marker-gold.png (new)
labs/openlayers/img/marker-green.png (new)
labs/openlayers/img/marker.png (new)
labs/openlayers/img/measuring-stick-off.png (new)
labs/openlayers/img/measuring-stick-on.png (new)
labs/openlayers/img/north-mini.png (new)
labs/openlayers/img/panning-hand-off.png (new)
labs/openlayers/img/panning-hand-on.png (new)
labs/openlayers/img/slider.png (new)
labs/openlayers/img/south-mini.png (new)
labs/openlayers/img/west-mini.png (new)
labs/openlayers/img/zoom-minus-mini.png (new)
labs/openlayers/img/zoom-plus-mini.png (new)
labs/openlayers/img/zoom-world-mini.png (new)
labs/openlayers/img/zoombar.png (new)
labs/openlayers/lib/Firebug/errorIcon.png (new)
labs/openlayers/lib/Firebug/firebug.css (new)
labs/openlayers/lib/Firebug/firebug.html (new)
labs/openlayers/lib/Firebug/firebug.js (new)
labs/openlayers/lib/Firebug/firebugx.js (new)
labs/openlayers/lib/Firebug/infoIcon.png (new)
labs/openlayers/lib/Firebug/license.txt (new)
labs/openlayers/lib/Firebug/readme.txt (new)
labs/openlayers/lib/Firebug/warningIcon.png (new)
labs/openlayers/lib/Gears/gears_init.js (new)
labs/openlayers/lib/OpenLayers.js (new)
labs/openlayers/lib/OpenLayers/Ajax.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/Class.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/Element.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/LonLat.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/Pixel.js (new)
labs/openlayers/lib/OpenLayers/BaseTypes/Size.js (new)
labs/openlayers/lib/OpenLayers/Console.js (new)
labs/openlayers/lib/OpenLayers/Control.js (new)
labs/openlayers/lib/OpenLayers/Control/ArgParser.js (new)
labs/openlayers/lib/OpenLayers/Control/Attribution.js (new)
labs/openlayers/lib/OpenLayers/Control/Button.js (new)
labs/openlayers/lib/OpenLayers/Control/DragFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/DragPan.js (new)
labs/openlayers/lib/OpenLayers/Control/DrawFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/EditingToolbar.js (new)
labs/openlayers/lib/OpenLayers/Control/GetFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/Graticule.js (new)
labs/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js (new)
labs/openlayers/lib/OpenLayers/Control/LayerSwitcher.js (new)
labs/openlayers/lib/OpenLayers/Control/Measure.js (new)
labs/openlayers/lib/OpenLayers/Control/ModifyFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/MouseDefaults.js (new)
labs/openlayers/lib/OpenLayers/Control/MousePosition.js (new)
labs/openlayers/lib/OpenLayers/Control/MouseToolbar.js (new)
labs/openlayers/lib/OpenLayers/Control/NavToolbar.js (new)
labs/openlayers/lib/OpenLayers/Control/Navigation.js (new)
labs/openlayers/lib/OpenLayers/Control/NavigationHistory.js (new)
labs/openlayers/lib/OpenLayers/Control/OverviewMap.js (new)
labs/openlayers/lib/OpenLayers/Control/Pan.js (new)
labs/openlayers/lib/OpenLayers/Control/PanPanel.js (new)
labs/openlayers/lib/OpenLayers/Control/PanZoom.js (new)
labs/openlayers/lib/OpenLayers/Control/PanZoomBar.js (new)
labs/openlayers/lib/OpenLayers/Control/Panel.js (new)
labs/openlayers/lib/OpenLayers/Control/Permalink.js (new)
labs/openlayers/lib/OpenLayers/Control/SLDSelect.js (new)
labs/openlayers/lib/OpenLayers/Control/Scale.js (new)
labs/openlayers/lib/OpenLayers/Control/ScaleLine.js (new)
labs/openlayers/lib/OpenLayers/Control/SelectFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/Snapping.js (new)
labs/openlayers/lib/OpenLayers/Control/Split.js (new)
labs/openlayers/lib/OpenLayers/Control/TransformFeature.js (new)
labs/openlayers/lib/OpenLayers/Control/WMSGetFeatureInfo.js (new)
labs/openlayers/lib/OpenLayers/Control/WMTSGetFeatureInfo.js (new)
labs/openlayers/lib/OpenLayers/Control/ZoomBox.js (new)
labs/openlayers/lib/OpenLayers/Control/ZoomIn.js (new)
labs/openlayers/lib/OpenLayers/Control/ZoomOut.js (new)
labs/openlayers/lib/OpenLayers/Control/ZoomPanel.js (new)
labs/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js (new)
labs/openlayers/lib/OpenLayers/Events.js (new)
labs/openlayers/lib/OpenLayers/Feature.js (new)
labs/openlayers/lib/OpenLayers/Feature/Vector.js (new)
labs/openlayers/lib/OpenLayers/Feature/WFS.js (new)
labs/openlayers/lib/OpenLayers/Filter.js (new)
labs/openlayers/lib/OpenLayers/Filter/Comparison.js (new)
labs/openlayers/lib/OpenLayers/Filter/FeatureId.js (new)
labs/openlayers/lib/OpenLayers/Filter/Logical.js (new)
labs/openlayers/lib/OpenLayers/Filter/Spatial.js (new)
labs/openlayers/lib/OpenLayers/Format.js (new)
labs/openlayers/lib/OpenLayers/Format/ArcXML.js (new)
labs/openlayers/lib/OpenLayers/Format/ArcXML/Features.js (new)
labs/openlayers/lib/OpenLayers/Format/Atom.js (new)
labs/openlayers/lib/OpenLayers/Format/CSWGetDomain.js (new)
labs/openlayers/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js (new)
labs/openlayers/lib/OpenLayers/Format/CSWGetRecords.js (new)
labs/openlayers/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js (new)
labs/openlayers/lib/OpenLayers/Format/Context.js (new)
labs/openlayers/lib/OpenLayers/Format/Filter.js (new)
labs/openlayers/lib/OpenLayers/Format/Filter/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/Filter/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/Filter/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/GML.js (new)
labs/openlayers/lib/OpenLayers/Format/GML/Base.js (new)
labs/openlayers/lib/OpenLayers/Format/GML/v2.js (new)
labs/openlayers/lib/OpenLayers/Format/GML/v3.js (new)
labs/openlayers/lib/OpenLayers/Format/GPX.js (new)
labs/openlayers/lib/OpenLayers/Format/GeoJSON.js (new)
labs/openlayers/lib/OpenLayers/Format/GeoRSS.js (new)
labs/openlayers/lib/OpenLayers/Format/JSON.js (new)
labs/openlayers/lib/OpenLayers/Format/KML.js (new)
labs/openlayers/lib/OpenLayers/Format/OSM.js (new)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/OWSCommon/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/OWSContext.js (new)
labs/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js (new)
labs/openlayers/lib/OpenLayers/Format/SLD.js (new)
labs/openlayers/lib/OpenLayers/Format/SLD/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/SLD/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/SOSCapabilities.js (new)
labs/openlayers/lib/OpenLayers/Format/SOSCapabilities/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/SOSGetFeatureOfInterest.js (new)
labs/openlayers/lib/OpenLayers/Format/SOSGetObservation.js (new)
labs/openlayers/lib/OpenLayers/Format/Text.js (new)
labs/openlayers/lib/OpenLayers/Format/WFS.js (new)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities.js (new)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WFSCapabilities/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WFSDescribeFeatureType.js (new)
labs/openlayers/lib/OpenLayers/Format/WFST.js (new)
labs/openlayers/lib/OpenLayers/Format/WFST/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/WFST/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WFST/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WKT.js (new)
labs/openlayers/lib/OpenLayers/Format/WMC.js (new)
labs/openlayers/lib/OpenLayers/Format/WMC/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/WMC/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WMC/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSCapabilities/v1_3_0.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSDescribeLayer.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSDescribeLayer/v1_1.js (new)
labs/openlayers/lib/OpenLayers/Format/WMSGetFeatureInfo.js (new)
labs/openlayers/lib/OpenLayers/Format/WMTSCapabilities.js (new)
labs/openlayers/lib/OpenLayers/Format/WMTSCapabilities/v1_0_0.js (new)
labs/openlayers/lib/OpenLayers/Format/XML.js (new)
labs/openlayers/lib/OpenLayers/Geometry.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Collection.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Curve.js (new)
labs/openlayers/lib/OpenLayers/Geometry/LineString.js (new)
labs/openlayers/lib/OpenLayers/Geometry/LinearRing.js (new)
labs/openlayers/lib/OpenLayers/Geometry/MultiLineString.js (new)
labs/openlayers/lib/OpenLayers/Geometry/MultiPoint.js (new)
labs/openlayers/lib/OpenLayers/Geometry/MultiPolygon.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Point.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Polygon.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Rectangle.js (new)
labs/openlayers/lib/OpenLayers/Geometry/Surface.js (new)
labs/openlayers/lib/OpenLayers/Handler.js (new)
labs/openlayers/lib/OpenLayers/Handler/Box.js (new)
labs/openlayers/lib/OpenLayers/Handler/Click.js (new)
labs/openlayers/lib/OpenLayers/Handler/Drag.js (new)
labs/openlayers/lib/OpenLayers/Handler/Feature.js (new)
labs/openlayers/lib/OpenLayers/Handler/Hover.js (new)
labs/openlayers/lib/OpenLayers/Handler/Keyboard.js (new)