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

Merge branch '2.5.x' into cc-5709-airtime-analyzer

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
This commit is contained in:
drigato 2014-08-28 11:59:41 -04:00
commit 9fe0830dfd
93 changed files with 36793 additions and 2254 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/build/schema.xml
View file

@ -474,11 +474,6 @@
<reference local="mount_name_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_locale" phpName="CcLocale">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="locale_code" phpName="DbLocaleCode" type="VARCHAR" size="16" required="true" />
<column name="locale_lang" phpName="DbLocaleLang" type="VARCHAR" size="128" required="true" />
</table>
<table name="cc_playout_history" phpName="CcPlayoutHistory">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="file_id" phpName="DbFileId" type="INTEGER" required="false" />