Merge /var/www/busui
author Maxious
()
committer Maxious
()
commit 796277d9060f31760e49aa172bca45ae909b7a64
tree a22739c3143f6585fe2d98d4b1b16bc894e8786c
parent c0fb119a623ca9148906f734c0119e5826a87255
parent a30092ad7c705a12c9afea1c74b9ae961415a777
Merge /var/www/busui

Conflicts:
index.php
901 files changed:
about.php [ new file with mode 0755 ]
aws/awsStartup.sh [ new file with mode 0755 ]
aws/compress.conf [ new file with mode 0644 ]
aws/expire.conf [ new file with mode 0644 ]
aws/fastcgi.conf [ new file with mode 0755 ]
aws/modules.conf [ new file with mode 0755 ]
aws/pg_hba.conf [ new file with mode 0644 ]
aws/php.ini [ new file with mode 0755 ]
aws/postgresql.conf [ new file with mode 0644 ]
aws/rc.local [ new file with mode 0755 ]
css/images/113-navigation.png [ new file with mode 0755 ]
css/images/91-beaker-2.png [ new file with mode 0644 ]
css/images/ajax-loader.png [ new file with mode 0755 ]
css/images/form-check-off.png [ new file with mode 0755 ]
css/images/form-check-on.png [ new file with mode 0755 ]
css/images/form-radio-off.png [ new file with mode 0755 ]
css/images/form-radio-on.png [ new file with mode 0755 ]
css/images/icon-search-black.png [ new file with mode 0755 ]
css/images/icons-18-black.png [ new file with mode 0755 ]
css/images/icons-18-white.png [ new file with mode 0755 ]
css/images/icons-36-black.png [ new file with mode 0755 ]
css/images/icons-36-white.png [ new file with mode 0755 ]
css/images/time.png [ new file with mode 0644 ]
css/jquery.mobile-1.0a4.css [ new file with mode 0644 ]
css/jquery.ui.datepicker.mobile.css [ new file with mode 0755 ]
dotcloud/postinstall [ new file with mode 0755 ]
dotcloud/push.sh [ new file with mode 0644 ]
feedback.php [ new file with mode 0755 ]
include/common-db.inc.php [ new file with mode 0644 ]
include/common-geo.inc.php [ new file with mode 0644 ]
include/common-net.inc.php [ new file with mode 0644 ]
include/common-session.inc.php [ new file with mode 0644 ]
include/common-template.inc.php [ new file with mode 0644 ]
include/common-transit.inc.php [ new file with mode 0644 ]
include/common.inc.php [ new file with mode 0755 ]
include/db/route-dao.inc.php [ new file with mode 0644 ]
include/db/stop-dao.inc.php [ new file with mode 0644 ]
include/db/trip-dao.inc.php [ new file with mode 0644 ]
index.php
js/flotr/flotr-0.2.0-alpha.js [ new file with mode 0644 ]
js/flotr/flotr.debug-0.2.0-alpha_radar1.js [ new file with mode 0644 ]
js/flotr/lib/base64.js [ new file with mode 0644 ]
js/flotr/lib/canvas2image.js [ new file with mode 0644 ]
js/flotr/lib/canvastext.js [ new file with mode 0644 ]
js/flotr/lib/excanvas.js [ new file with mode 0644 ]
js/flotr/lib/prototype-1.6.0.2.js [ new file with mode 0644 ]
js/jQuery.ui.datepicker.js [ new file with mode 0755 ]
js/jquery-1.5.js [ new file with mode 0755 ]
js/jquery.effects.core.js [ new file with mode 0755 ]
js/jquery.mobile-1.0a4.js [ new file with mode 0644 ]
js/jquery.ui.autocomplete.js [ new file with mode 0755 ]
js/jquery.ui.position.js [ new file with mode 0755 ]
js/jquery.ui.widget.js [ new file with mode 0755 ]
labs/OpenStreetMap.js [ new file with mode 0755 ]
labs/about.php [ new symlink with mode 0000 ]
labs/busstopdensity.php [ new file with mode 0644 ]
labs/busstopdensity.tile.php [ new file with mode 0644 ]
labs/css [ new symlink with mode 0000 ]
labs/feedback.php [ new symlink with mode 0000 ]
labs/googlemaps.php [ new file with mode 0644 ]
labs/gradient/classic.png [ new file with mode 0644 ]
labs/gradient/fire.png [ new file with mode 0644 ]
labs/gradient/pgaitch.png [ new file with mode 0644 ]
labs/index.php [ new file with mode 0755 ]
labs/js [ new symlink with mode 0000 ]
labs/lib [ new symlink with mode 0000 ]
labs/myway_api.json.php [ new file with mode 0644 ]
labs/mywaybalance.php [ new file with mode 0644 ]
labs/networkstats.php [ new file with mode 0755 ]
labs/openlayers/OpenLayers.js [ new file with mode 0644 ]
labs/openlayers/build/README.txt [ new file with mode 0644 ]
labs/openlayers/build/build.py [ new file with mode 0755 ]