diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /install/database.sql | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'install/database.sql')
| -rw-r--r-- | install/database.sql | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/install/database.sql b/install/database.sql index cd31a0285..cbfca822c 100644 --- a/install/database.sql +++ b/install/database.sql @@ -160,18 +160,18 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_allow_gid` mediumtext NOT NULL, `channel_deny_cid` mediumtext NOT NULL, `channel_deny_gid` mediumtext NOT NULL, - `channel_r_stream` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_r_profile` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_r_photos` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_r_abook` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_stream` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_wall` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_tagwall` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_comment` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_mail` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_photos` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_w_chat` tinyint(3) unsigned NOT NULL DEFAULT '128', - `channel_a_delegate` tinyint(3) unsigned NOT NULL DEFAULT '0', + `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128', + `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128', + `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128', + `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128', + `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128', + `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0', `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128', `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128', `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128', @@ -1027,6 +1027,19 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_follow` (`xchan_follow`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `xchat` ( + `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `xchat_url` char(255) NOT NULL DEFAULT '', + `xchat_desc` char(255) NOT NULL DEFAULT '', + `xchat_xchan` char(255) NOT NULL DEFAULT '', + `xchat_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`xchat_id`), + KEY `xchat_url` (`xchat_url`), + KEY `xchat_desc` (`xchat_desc`), + KEY `xchat_xchan` (`xchat_xchan`), + KEY `xchat_edited` (`xchat_edited`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `xconfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `xchan` char(255) NOT NULL, |