gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

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

author	Maxious
	Fri, 16 Sep 2011 03:54:55 +0000 (13:54 +1000)
committer	Maxious
	Fri, 16 Sep 2011 03:54:55 +0000 (13:54 +1000)
commit	eab66b5536ccd82688375fd40a38589c3decf7a0
tree	bf9623ce051c3c74c613e8f560533341c1fdd2f1	tree \| snapshot
parent	0dc105deddf45bf359e88445ba8371b31ec212e4	commit \| commitdiff
parent	e7de731633b6d3b6cea9c76da7386f2385bec779	commit \| commitdiff

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

Conflicts:
include/common-auth.inc.php
lib/openid-php/Auth/OpenID/Consumer.php
lib/openid-php/Auth/OpenID/Server.php
lib/openid-php/Auth/OpenID/TrustRoot.php
lib/openid-php/Auth/Yadis/Manager.php
lib/openid-php/Auth/Yadis/XRDS.php

69 files changed:

about.php		blob \| diff \| history \| plain
css/jquery.mobile-1.0b3.css	[ moved from css/jquery.mobile-1.0b2.css with 97%% similarity ]	blob \| diff \| plain
include/common-db.inc.php		blob \| diff \| history \| plain
include/common-geo.inc.php		blob \| diff \| history \| plain
include/common-net.inc.php		blob \| diff \| history \| plain
include/common-request.inc.php		blob \| diff \| history \| plain
include/common-session.inc.php		blob \| diff \| history \| plain
include/common-template.inc.php		blob \| diff \| history \| plain
include/common-transit.inc.php		blob \| diff \| history \| plain
include/common.inc.php		blob \| diff \| history \| plain
include/db/route-dao.inc.php		blob \| diff \| history \| plain
include/db/servicealert-dao.inc.php		blob \| diff \| history \| plain
include/db/stop-dao.inc.php		blob \| diff \| history \| plain
include/db/trip-dao.inc.php		blob \| diff \| history \| plain
index.php		blob \| diff \| history \| plain
js/jquery.mobile-1.0b3.js	[ moved from js/jquery.mobile-1.0b2.js with 82%% similarity ]	blob \| diff \| plain
labs/index.php		blob \| diff \| history \| plain
labs/myway_api.json.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_calculate.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_freqdist.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_overview.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_reconcile.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_route.json.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_route.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_stop.json.php	[ deleted file ]	blob \| history \| plain
labs/myway_timeliness_stop.php	[ deleted file ]	blob \| history \| plain
labs/mywaybalance.php	[ deleted file ]	blob \| history \| plain
labs/servicealert_editor.php	[ deleted file ]	blob \| history \| plain
labs/stop.pdf.php		blob \| diff \| history \| plain
labs/stopBrowser.kml.php		blob \| diff \| history \| plain
labs/stopBrowser.php		blob \| diff \| history \| plain
labs/travelAllRoutes.php	[ deleted file ]	blob \| history \| plain
labs/tripPlannerTester.kml.php	[ deleted file ]	blob \| history \| plain
labs/tripPlannerTester.php	[ deleted file ]	blob \| history \| plain
layar_api.php		blob \| diff \| history \| plain
lib/Protobuf-PHP/test-alert.php	[ moved from lib/Protobuf-PHP/test.php with 91%% similarity ]	blob \| diff \| plain
lib/Protobuf-PHP/test-tripupdates.php	[ new file with mode 0644 ]	blob \| plain
lib/openid-php/Auth/OpenID/Consumer.php	[ new file with mode 0644 ]	blob \| plain
lib/openid-php/Auth/OpenID/Server.php	[ new file with mode 0644 ]	blob \| plain
lib/openid-php/Auth/OpenID/TrustRoot.php	[ new file with mode 0644 ]	blob \| plain
lib/openid-php/Auth/Yadis/Manager.php	[ new file with mode 0644 ]	blob \| plain
lib/openid-php/Auth/Yadis/XRDS.php	[ new file with mode 0644 ]	blob \| plain
myway/index.php	[ new file with mode 0755 ]	blob \| plain
myway/myway_api.json.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_calculate.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_freqdist.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_overview.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_reconcile.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_route.json.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_route.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_stop.json.php	[ new file with mode 0644 ]	blob \| plain
myway/myway_timeliness_stop.php	[ new file with mode 0644 ]	blob \| plain
myway/mywaybalance.php	[ new file with mode 0644 ]	blob \| plain
privacy.php		blob \| diff \| history \| plain
readme.txt		blob \|