Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts: airtime_mvc/application/models/StoredFile.php airtime_mvc/application/models/airtime/om/BaseCcFiles.php airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
This commit is contained in:
commit
d5d4d50a9e
24 changed files with 4604 additions and 373 deletions
|
@ -72,6 +72,8 @@ CREATE TABLE "cc_files"
|
|||
"currentlyaccessing" INTEGER default 0 NOT NULL,
|
||||
"editedby" INTEGER,
|
||||
"mtime" TIMESTAMP(6),
|
||||
"utime" TIMESTAMP(6),
|
||||
"lptime" TIMESTAMP(6),
|
||||
"md5" CHAR(32),
|
||||
"track_title" VARCHAR(512),
|
||||
"artist_name" VARCHAR(512),
|
||||
|
@ -288,6 +290,8 @@ CREATE TABLE "cc_playlist"
|
|||
"currentlyaccessing" INTEGER default 0 NOT NULL,
|
||||
"editedby" INTEGER,
|
||||
"mtime" TIMESTAMP(6),
|
||||
"utime" TIMESTAMP(6),
|
||||
"lptime" TIMESTAMP(6),
|
||||
"creator" VARCHAR(32),
|
||||
"description" VARCHAR(512),
|
||||
PRIMARY KEY ("id")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue