From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 15 Jun 2009 18:50:08 +0000 (-0700)
Subject: Merge branch '0.8.x' into userdesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=92f095f589b3fc4ab40f72f873d6a7a189b63a96;p=quix0rs-gnu-social.git

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
---

92f095f589b3fc4ab40f72f873d6a7a189b63a96
diff --cc classes/laconica.ini
index 07aa016fef,df292bbffd..c04ae758f4
mode 100755,100644..100755
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
diff --cc db/laconica.sql
index 2ca084e48d,b8c0824f5a..bd95d1ade6
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@@ -487,12 -484,22 +488,32 @@@ create table file_to_post 
      unique(file_id, post_id)
  ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
  
 +create table design (
 +    id integer primary key auto_increment comment 'design ID',
 +    backgroundcolor integer comment 'main background color',
 +    contentcolor integer comment 'content area background color',
 +    sidebarcolor integer comment 'sidebar background color',
 +    textcolor integer comment 'text color',
 +    linkcolor integer comment 'link color',
 +    backgroundimage varchar(255) comment 'background image, if any'
 +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
++
+ create table group_block (
+    group_id integer not null comment 'group profile is blocked from' references user_group (id),
+    blocked integer not null comment 'profile that is blocked' references profile (id),
+    blocker integer not null comment 'user making the block' references user (id),
+    modified timestamp comment 'date of blocking',
+ 
+    constraint primary key (group_id, blocked)
+ 
+ ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+ 
+ create table group_alias (
+ 
+    alias varchar(64) primary key comment 'additional nickname for the group',
+    group_id integer not null comment 'group profile is blocked from' references user_group (id),
+    modified timestamp comment 'date alias was created',
+ 
+    index group_alias_group_id_idx (group_id)
+ 
+ ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;