forked from GNUsocial/gnu-social
Merge branch '1.0.x' into limitdist2
This commit is contained in:
@@ -118,6 +118,7 @@ $schema['user'] = array(
|
||||
'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
|
||||
'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
|
||||
'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
|
||||
'subscribe_policy' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can subscribe; 1 = require approval'),
|
||||
'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
|
||||
'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
|
||||
'design_id' => array('type' => 'int', 'description' => 'id of a design'),
|
||||
@@ -1031,3 +1032,5 @@ $schema['schema_version'] = array(
|
||||
);
|
||||
|
||||
$schema['group_join_queue'] = Group_join_queue::schemaDef();
|
||||
|
||||
$schema['subscription_queue'] = Subscription_queue::schemaDef();
|
||||
|
Reference in New Issue
Block a user