Merge branch 'master' into CC-2301

This commit is contained in:
Naomi 2013-05-01 11:04:14 -04:00
commit 92ef0608d6
673 changed files with 53058 additions and 259758 deletions

View file

@ -156,6 +156,8 @@ CREATE TABLE "cc_show"
"live_stream_using_custom_auth" BOOLEAN default 'f',
"live_stream_user" VARCHAR(255),
"live_stream_pass" VARCHAR(255),
"linked" BOOLEAN default 'f' NOT NULL,
"is_linkable" BOOLEAN default 't' NOT NULL,
PRIMARY KEY ("id")
);
@ -428,6 +430,7 @@ CREATE TABLE "cc_schedule"
"instance_id" INTEGER NOT NULL,
"playout_status" INT2 default 1 NOT NULL,
"broadcasted" INT2 default 0 NOT NULL,
"position" INTEGER default 0 NOT NULL,
PRIMARY KEY ("id")
);