diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-15 11:50:08 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-15 11:50:08 -0700 |
| commit | 92f095f589b3fc4ab40f72f873d6a7a189b63a96 (patch) | |
| tree | ddb98469e596b276219becca33a93b0a454961dd /db/site.sql | |
| parent | 946d016df2a5e0af5e1b4b983b30c113dd02b4ea (diff) | |
| parent | eb6a60ef8833d0a34768f2717f2a34fdcd52e5ce (diff) | |
Merge branch '0.8.x' into userdesign
* 0.8.x: (32 commits)
updates to Status_network
makeadmin action
make admins of groups
show aliases when showing a group
Link and distribute notices tagged for a group alias
Code for adding and saving group aliases
Styles for group block
add correct li for css magic for block stuff
typo in profileminilist class
return count from show
try to get the right class for profileminilist
fix perms for classes/statusnet.ini
fixup perms for classes
Added Group_alias class
add a table for group aliases
Cross-browser notice_attach
Allow users to be unblocked from a group
Some UI improvements for blocking and unblocking
The rest of the things necessary to make group block work
Make group block work
...
Conflicts:
db/laconica.sql
lib/common.php
Diffstat (limited to 'db/site.sql')
| -rw-r--r-- | db/site.sql | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/db/site.sql b/db/site.sql index 660ba475b..a9f64e5a5 100644 --- a/db/site.sql +++ b/db/site.sql @@ -5,12 +5,16 @@ create table status_network ( nickname varchar(64) primary key comment 'nickname', hostname varchar(255) unique key comment 'alternate hostname if any', pathname varchar(255) unique key comment 'alternate pathname if any', - sitename varchar(255) comment 'display name', + dbhost varchar(255) comment 'database host', dbuser varchar(255) comment 'database username', dbpass varchar(255) comment 'database password', dbname varchar(255) comment 'database name', + sitename varchar(255) comment 'display name', + theme varchar(255) comment 'theme name', + logo varchar(255) comment 'site logo', + created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified' |