61 Commits

Author	SHA1	Message	Date
calzoneman	d7a0297a8b	Resolve merge conflict	2013-11-09 01:56:28 -06:00
calzoneman	e737bc9f8a	Strip ip, expire from Google Docs flashvars	2013-11-08 17:57:14 -06:00
calzoneman	4198f3ce2c	Add support for Google Docs videos	2013-11-07 17:19:36 -06:00
calzoneman	f2c996ebfa	major refactoring	2013-10-11 16:31:40 -05:00
calzoneman	718a70bc60	Fix clean; minor error message fixes	2013-10-07 00:10:16 -05:00
calzoneman	9d35636be2	Resolve merge conflict	2013-10-01 23:05:02 -05:00
calzoneman	54dee9e25d	Fix some error messages, intialize announcement to null	2013-09-30 21:59:04 -05:00
calzoneman	69ac0b39ad	Check for videos where embedding is disabled	2013-09-29 21:32:04 -05:00
calzoneman	21bd270813	Improvements to playlist queue	2013-09-29 11:30:36 -05:00
calzoneman	6aae146f8b	Fix ustream for channels with /channel/foo syntax; ustream wtf are you doing	2013-09-17 13:19:33 -05:00
calzoneman	7840fa35e8	Move server files to lib/ to clean up root directory	2013-09-05 13:48:05 -05:00