Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	application/controllers/ScheduleController.php
This commit is contained in:
Naomi 2011-02-09 14:15:18 -05:00
commit 108bf65930
33 changed files with 787 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build/schema.xml
View file

@ -264,6 +264,9 @@
<column name="last_name" phpName="DbLastName" type="VARCHAR" size="255" required="true" defaultValue=""/>
<column name="lastlogin" phpName="DbLastlogin" type="TIMESTAMP" required="false"/>
<column name="lastfail" phpName="DbLastfail" type="TIMESTAMP" required="false"/>
<column name="skype_contact" phpName="DbSkypeContact" type="VARCHAR" required="false"/>
<column name="jabber_contact" phpName="DbJabberContact" type="VARCHAR" required="false"/>
<column name="email" phpName="DbEmail" type="VARCHAR" required="false"/>
<unique name="cc_subjs_id_idx">
<unique-column name="id"/>
</unique>

3
build/sql/schema.sql
View file

@ -402,6 +402,9 @@ CREATE TABLE "cc_subjs"
"last_name" VARCHAR(255) default '' NOT NULL,
"lastlogin" TIMESTAMP,
"lastfail" TIMESTAMP,
"skype_contact" VARCHAR(255),
"jabber_contact" VARCHAR(255),
"email" VARCHAR(255),
PRIMARY KEY ("id"),
CONSTRAINT "cc_subjs_id_idx" UNIQUE ("id"),
CONSTRAINT "cc_subjs_login_idx" UNIQUE ("login")