gitphp 0.2.9.1 :: busui.git/commitdiff

Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
include/common.inc.php

256 files changed: (show all)
.box (new)
.gitignore (new)
about.php
aws/awsStartup.sh
aws/busuidb.sh (new)
aws/busuiotp.sh (new)
aws/busuiotp.testing.sh (new)
aws/busuiphp.sh (new)
aws/data-sources.xml (new)
aws/pg_hba.conf
aws/postgresql.conf (new)
css/images/ui-bg_diagonals-thick_18_b81900_40x40.png (new)
css/images/ui-bg_diagonals-thick_20_666666_40x40.png (new)
css/images/ui-bg_flat_10_000000_40x100.png (new)
css/images/ui-bg_glass_100_f6f6f6_1x400.png (new)
css/images/ui-bg_glass_100_fdf5ce_1x400.png (new)
css/images/ui-bg_glass_65_ffffff_1x400.png (new)
css/images/ui-bg_gloss-wave_35_f6a828_500x100.png (new)
css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png (new)
css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png (new)
css/images/ui-icons_222222_256x240.png (new)
css/images/ui-icons_228ef1_256x240.png (new)
css/images/ui-icons_ef8c08_256x240.png (new)
css/images/ui-icons_ffd27a_256x240.png (new)
css/images/ui-icons_ffffff_256x240.png (new)
css/images/warning.png (new)
css/jquery-ui-1.8.12.custom.css (new)
css/jquery.mobile-1.0a4.css (deleted)
css/jquery.mobile-1.0b2.css (new)
css/jquery.ui.datepicker.mobile.css (deleted)
css/local.css.php (new)
dotcloud/postinstall (new)
dotcloud/push.sh (new)
feedback.php
geo/route.kml.php (new)
geo/stops.kml.php (new)
include/common-auth.inc.php (new)
include/common-db.inc.php
include/common-geo.inc.php
include/common-net.inc.php
include/common-request.inc.php (new)
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 (new)
include/db/stop-dao.inc.php
include/db/trip-dao.inc.php
index.php
js/LAB.min.js (new)
js/flot/excanvas.js (new)
js/flot/excanvas.min.js (new)
js/flot/jquery.colorhelpers.js (new)
js/flot/jquery.colorhelpers.min.js (new)
js/flot/jquery.flot.crosshair.js (new)
js/flot/jquery.flot.crosshair.min.js (new)
js/flot/jquery.flot.fillbetween.js (new)
js/flot/jquery.flot.fillbetween.min.js (new)
js/flot/jquery.flot.image.js (new)
js/flot/jquery.flot.image.min.js (new)
js/flot/jquery.flot.js (new)
js/flot/jquery.flot.min.js (new)
js/flot/jquery.flot.navigate.js (new)
js/flot/jquery.flot.navigate.min.js (new)
js/flot/jquery.flot.pie.js (new)
js/flot/jquery.flot.pie.min.js (new)
js/flot/jquery.flot.resize.js (new)
js/flot/jquery.flot.resize.min.js (new)
js/flot/jquery.flot.selection.js (new)
js/flot/jquery.flot.selection.min.js (new)
js/flot/jquery.flot.stack.js (new)
js/flot/jquery.flot.stack.min.js (new)
js/flot/jquery.flot.symbol.js (new)
js/flot/jquery.flot.symbol.min.js (new)
js/flot/jquery.flot.threshold.js (new)
js/flot/jquery.flot.threshold.min.js (new)
js/flotr/flotr-0.2.0-alpha.js (deleted)
js/flotr/flotr.debug-0.2.0-alpha_radar1.js (deleted)
js/flotr/lib/base64.js (deleted)
js/flotr/lib/canvas2image.js (deleted)
js/flotr/lib/canvastext.js (deleted)
js/flotr/lib/excanvas.js (deleted)
js/flotr/lib/prototype-1.6.0.2.js (deleted)
js/jQuery.ui.datepicker.js (deleted)
js/jquery-1.5.js (deleted)
js/jquery-1.6.2.min.js (new)
js/jquery.effects.core.js (deleted)
js/jquery.mobile-1.0a4.js (deleted)
js/jquery.mobile-1.0b2.js (new)
js/jquery.ui.autocomplete.js (deleted)
js/jquery.ui.autocomplete.min.js (new)
js/jquery.ui.core.min.js (new)
js/jquery.ui.position.js (deleted)
js/jquery.ui.position.min.js (new)
js/jquery.ui.widget.js (deleted)
js/jquery.ui.widget.min.js (new)
labs/about.php (deleted)
labs/busstopdensity.php
labs/busstopdensity.tile.php
labs/css (deleted)
labs/feedback.php (deleted)
labs/index.php
labs/js (deleted)
labs/lib (deleted)
labs/myway_api.json.php
labs/myway_timeliness.php (new)
labs/myway_timeliness_calculate.php (new)
labs/myway_timeliness_freqdist.php (new)
labs/myway_timeliness_overview.php (new)
labs/myway_timeliness_reconcile.php (new)
labs/myway_timeliness_route.json.php (new)
labs/myway_timeliness_route.php (new)
labs/myway_timeliness_stop.json.php (new)
labs/myway_timeliness_stop.php (new)
labs/mywaybalance.php
labs/networkstats.php (deleted)
labs/servicealert_editor.php (new)
labs/servicealerts_twitter/NameFinder.java (new)
labs/servicealerts_twitter/pom.xml (new)
labs/stopBrowser.kml.php (new)
labs/stopBrowser.php (new)
labs/tiles/empty.png
labs/travelAllRoutes.php (new)
labs/tripPlannerTester.kml.php
labs/tripPlannerTester.php
layar_api.php
lib/Protobuf-PHP/LICENSE (new)
lib/Protobuf-PHP/README.md (new)
lib/Protobuf-PHP/Rakefile (new)
lib/Protobuf-PHP/gtfs-realtime.php (new)
lib/Protobuf-PHP/gtfs-realtime.proto (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/AnnotatedMessage.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Reader.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Unknown.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Writer.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Json.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/JsonIndexed.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/JsonTagMap.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/PhpArray.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/PhpArray/Unknown.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/TextFormat.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Xml.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/CodecInterface.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/AbstractGenerator.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/Cli.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/CommentsParser.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/JsonGenerator.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/PhpGenerator.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/descriptor.pb.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/descriptor.proto (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/json.pb.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/json.proto (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/php.pb.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/php.proto (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/plugin.pb.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/plugin.proto (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Descriptor.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Exception.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Field.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Message.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Registry.php (new)
lib/Protobuf-PHP/library/DrSlump/Protobuf/Unknown.php (new)
lib/Protobuf-PHP/man/protobuf-php.3.ronn (new)
lib/Protobuf-PHP/man/protobuf-php.5.ronn (new)
lib/Protobuf-PHP/man/protoc-gen-php.1.ronn (new)
lib/Protobuf-PHP/package.pear (new)
lib/Protobuf-PHP/protoc-gen-php.bat (new)
lib/Protobuf-PHP/protoc-gen-php.php (new)
lib/Protobuf-PHP/protoc.exe (new)
lib/Protobuf-PHP/test-alert.php (new)
lib/Protobuf-PHP/test-tripupdates.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.Binary.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.Json.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.JsonIndexed.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.JsonTagMap.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.TextFormat.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.Codec.Xml.spec.php (new)
lib/Protobuf-PHP/tests/Protobuf.spec.php (new)
lib/Protobuf-PHP/tests/benchmark.php (new)
lib/Protobuf-PHP/tests/protos/Annotated/Addressbook.php (new)
lib/Protobuf-PHP/tests/protos/Annotated/Repeated.php (new)
lib/Protobuf-PHP/tests/protos/Annotated/Simple.php (new)
lib/Protobuf-PHP/tests/protos/addressbook.bin (new)
lib/Protobuf-PHP/tests/protos/addressbook.php (new)
lib/Protobuf-PHP/tests/protos/addressbook.proto (new)
lib/Protobuf-PHP/tests/protos/addressbook.txt (new)
lib/Protobuf-PHP/tests/protos/repeated-int32.bin (new)
lib/Protobuf-PHP/tests/protos/repeated-int32.txt (new)
lib/Protobuf-PHP/tests/protos/repeated-nested.bin (new)
lib/Protobuf-PHP/tests/protos/repeated-nested.txt (new)
lib/Protobuf-PHP/tests/protos/repeated-string.bin (new)
lib/Protobuf-PHP/tests/protos/repeated-string.txt (new)
lib/Protobuf-PHP/tests/protos/repeated.php (new)
lib/Protobuf-PHP/tests/protos/repeated.proto (new)
lib/Protobuf-PHP/tests/protos/simple.bin (new)
lib/Protobuf-PHP/tests/protos/simple.php (new)
lib/Protobuf-PHP/tests/protos/simple.proto (new)
lib/Protobuf-PHP/tests/protos/simple.txt (new)
lib/autocomplete.php (new)
lib/openid-php/Auth/OpenID.php (new)
lib/openid-php/Auth/OpenID/AX.php (new)
lib/openid-php/Auth/OpenID/Association.php (new)
lib/openid-php/Auth/OpenID/BigMath.php (new)
lib/openid-php/Auth/OpenID/Consumer.php (new)
lib/openid-php/Auth/OpenID/CryptUtil.php (new)
lib/openid-php/Auth/OpenID/DatabaseConnection.php (new)
lib/openid-php/Auth/OpenID/DiffieHellman.php (new)
lib/openid-php/Auth/OpenID/Discover.php (new)
lib/openid-php/Auth/OpenID/DumbStore.php (new)
lib/openid-php/Auth/OpenID/Extension.php (new)
lib/openid-php/Auth/OpenID/FileStore.php (new)
lib/openid-php/Auth/OpenID/HMAC.php (new)
lib/openid-php/Auth/OpenID/Interface.php (new)
lib/openid-php/Auth/OpenID/KVForm.php (new)
lib/openid-php/Auth/OpenID/MDB2Store.php (new)
lib/openid-php/Auth/OpenID/MemcachedStore.php (new)
lib/openid-php/Auth/OpenID/Message.php (new)
lib/openid-php/Auth/OpenID/MySQLStore.php (new)
lib/openid-php/Auth/OpenID/Nonce.php (new)
lib/openid-php/Auth/OpenID/PAPE.php (new)
lib/openid-php/Auth/OpenID/Parse.php (new)
lib/openid-php/Auth/OpenID/PostgreSQLStore.php (new)
lib/openid-php/Auth/OpenID/SQLStore.php (new)
lib/openid-php/Auth/OpenID/SQLiteStore.php (new)
lib/openid-php/Auth/OpenID/SReg.php (new)
lib/openid-php/Auth/OpenID/Server.php (new)
lib/openid-php/Auth/OpenID/ServerRequest.php (new)
lib/openid-php/Auth/OpenID/TrustRoot.php (new)
lib/openid-php/Auth/OpenID/URINorm.php (new)
lib/openid-php/Auth/Yadis/HTTPFetcher.php (new)
lib/openid-php/Auth/Yadis/Manager.php (new)
lib/openid-php/Auth/Yadis/Misc.php (new)
lib/openid-php/Auth/Yadis/ParanoidHTTPFetcher.php (new)
lib/openid-php/Auth/Yadis/ParseHTML.php (new)
lib/openid-php/Auth/Yadis/PlainHTTPFetcher.php (new)
lib/openid-php/Auth/Yadis/XML.php (new)
lib/openid-php/Auth/Yadis/XRDS.php (new)
lib/openid-php/Auth/Yadis/XRI.php (new)
lib/openid-php/Auth/Yadis/XRIRes.php (new)
lib/openid-php/Auth/Yadis/Yadis.php (new)
postinstall (deleted)
privacy.php (new)
readme.txt
robots.txt
routeList.php
servicealerts_api.php (new)
sitemap.xml.php
stop.php
stopList.php
trip.php
tripPlanner.php
updatedb.php

file:b/.box (new)

	shared_writable_dirs:
	- /labs/tiles