diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
| commit | 598a2563e844477de2f688663c7c46962b26b602 (patch) | |
| tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /database.sql | |
| parent | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff) | |
| parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
| download | volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2 volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* master:
Diffstat (limited to 'database.sql')
| -rw-r--r-- | database.sql | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/database.sql b/database.sql index 48900839c..b20846bad 100644 --- a/database.sql +++ b/database.sql @@ -820,9 +820,11 @@ CREATE TABLE IF NOT EXISTS `profile` ( `region` char(255) NOT NULL, `postal-code` char(32) NOT NULL, `country-name` char(255) NOT NULL, + `hometown` char(255) NOT NULL, `gender` char(32) NOT NULL, `marital` char(255) NOT NULL, `with` text NOT NULL, + `howlong` datetime NOT NULL default '0000-00-00 00:00:00', `sexual` char(255) NOT NULL, `politic` char(255) NOT NULL, `religion` char(255) NOT NULL, |