Merge branch 'develop' into develop
This commit is contained in:
commit
12ad576014
|
@ -76,7 +76,8 @@
|
||||||
<field name="transfer_on_hangup" type="string" notnull="false"/>
|
<field name="transfer_on_hangup" type="string" notnull="false"/>
|
||||||
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
||||||
</table>
|
</table>
|
||||||
<table name="sccpline">
|
|
||||||
|
<table name="sccpline">
|
||||||
<field name="id" type="integer" autoincrement="true"/>
|
<field name="id" type="integer" autoincrement="true"/>
|
||||||
<field name="pin" type="string" length="7" notnull="false"/>
|
<field name="pin" type="string" length="7" notnull="false"/>
|
||||||
<field name="label" type="string" length="45" notnull="false"/>
|
<field name="label" type="string" length="45" notnull="false"/>
|
||||||
|
@ -120,9 +121,10 @@
|
||||||
<column name="id"/>
|
<column name="id"/>
|
||||||
</key>
|
</key>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<table name="sccpbuttonconfig">
|
<table name="sccpbuttonconfig">
|
||||||
<field name="ref" type="string" length="15" default="" primarykey="true"/>
|
<field name="ref" type="string" length="15" default="" primarykey="true"/>
|
||||||
<field name="reftype" type="string" default="sccpdevice" primarykey="true"/>
|
<field name="reftype" type="string" length="15" default="sccpdevice" primarykey="true"/>
|
||||||
<field name="instance" type="boolean" default="0" primarykey="true"/>
|
<field name="instance" type="boolean" default="0" primarykey="true"/>
|
||||||
<field name="buttontype" type="string" default="line" primarykey="true"/>
|
<field name="buttontype" type="string" default="line" primarykey="true"/>
|
||||||
<field name="name" type="string" length="36" notnull="false"/>
|
<field name="name" type="string" length="36" notnull="false"/>
|
||||||
|
|
Loading…
Reference in a new issue