gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

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

author	Maxious
	Sun, 04 Sep 2011 15:33:12 +0000 (15:33 +0000)
committer	Maxious
	Sun, 04 Sep 2011 15:33:12 +0000 (15:33 +0000)
commit	a956bd0cd793766df08deed2efa33f4e642e103e
tree	cde58ef7310c62f467920be5a0091d61f18e68d6	tree \| snapshot
parent	e1bdff3ead7371e46f0fd527ad0af3f82433aa99	commit \| commitdiff
parent	9473f41a854d786d15d0b143dc752474f5ffaeb6	commit \| commitdiff

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

146 files changed:

.gitignore	[ new file with mode 0644 ]	blob \| plain
about.php		blob \| diff \| history \| plain
aws/awsStartup.sh		blob \| diff \| history \| plain
aws/busuidb.sh	[ new file with mode 0644 ]	blob \| plain
aws/busuiotp.sh	[ new file with mode 0644 ]	blob \| plain
aws/busuiotp.testing.sh	[ new file with mode 0644 ]	blob \| plain
aws/busuiphp.sh	[ new file with mode 0644 ]	blob \| plain
aws/data-sources.xml	[ new file with mode 0644 ]	blob \| plain
css/jquery.mobile-1.0b2.css	[ moved from css/jquery.mobile-1.0b1.css with 79%% similarity ]	blob \| diff \| plain
include/common-auth.inc.php	[ new file with mode 0644 ]	blob \| 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
js/jquery-1.6.1.min.js	[ deleted file ]	blob \| history \| plain
js/jquery-1.6.2.min.js	[ new file with mode 0644 ]	blob \| plain
js/jquery.mobile-1.0b2.js	[ moved from js/jquery.mobile-1.0b1.js with 57%% similarity ]	blob \| diff \| plain
labs/busstopdensity.tile.php		blob \| diff \| history \| plain
labs/index.php		blob \| diff \| history \| plain
labs/myway_api.json.php		blob \| diff \| history \| plain
labs/myway_timeliness.php		blob \| diff \| history \| plain
labs/myway_timeliness_reconcile.php		blob \| diff \| history \| plain
labs/servicealert_editor.php	[ new file with mode 0644 ]	blob \| plain
labs/servicealerts_twitter/NameFinder.java	[ new file with mode 0644 ]	blob \| plain
labs/servicealerts_twitter/pom.xml	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/LICENSE	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/README.md	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/Rakefile	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/gtfs-realtime.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/gtfs-realtime.proto	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/AnnotatedMessage.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Reader.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Unknown.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Binary/Writer.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Json.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/JsonIndexed.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/JsonTagMap.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/PhpArray.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/PhpArray/Unknown.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/TextFormat.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Codec/Xml.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/CodecInterface.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/AbstractGenerator.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/Cli.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/CommentsParser.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/JsonGenerator.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/PhpGenerator.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/descriptor.pb.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/descriptor.proto	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/json.pb.php	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/json.proto	[ new file with mode 0644 ]	blob \| plain
lib/Protobuf-PHP/library/DrSlump/Protobuf/Compiler/protos/php.pb.php	[ new file with mode 0644 ]	blob \| plain