diff options
| author | zottel <github@zottel.net> | 2012-03-16 08:33:01 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-16 08:33:01 +0100 |
| commit | ea4c806c5c3adacb6ef585de657e5f34c2e24c98 (patch) | |
| tree | 1e3314f76eefd8f7d014ae8e4a218dc9663ae3d7 /database.sql | |
| parent | 69f4448adaf7afddf00deeb2f832938d5505abcf (diff) | |
| parent | 47e1b8d0c07d79c33f8b2de52145aa751d4b955a (diff) | |
| download | volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.gz volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.tar.bz2 volse-hubzilla-ea4c806c5c3adacb6ef585de657e5f34c2e24c98.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'database.sql')
| -rwxr-xr-x | database.sql | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/database.sql b/database.sql index 35c257f02..f058bc59e 100755 --- a/database.sql +++ b/database.sql @@ -92,6 +92,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `blocked` tinyint(1) NOT NULL DEFAULT '1', `readonly` tinyint(1) NOT NULL DEFAULT '0', `writable` tinyint(1) NOT NULL DEFAULT '0', + `forum` tinyint(1) NOT NULL DEFAULT '0', `hidden` tinyint(1) NOT NULL DEFAULT '0', `pending` tinyint(1) NOT NULL DEFAULT '1', `rating` tinyint(1) NOT NULL DEFAULT '0', @@ -116,6 +117,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( KEY `dfrn-id` (`dfrn-id`), KEY `blocked` (`blocked`), KEY `readonly` (`readonly`), + KEY `forum` (`forum`), KEY `hidden` (`hidden`), KEY `pending` (`pending`), KEY `closeness` (`closeness`) @@ -636,6 +638,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` ( `mailbox` CHAR( 255 ) NOT NULL, `user` CHAR( 255 ) NOT NULL , `pass` TEXT NOT NULL , +`reply_to` CHAR( 255 ) NOT NULL , `action` INT NOT NULL , `movetofolder` CHAR(255) NOT NULL , `pubmail` TINYINT(1) NOT NULL DEFAULT '0', |