migrating uss and forum to collaboration

docs/changelog/6.x.x.txt

@@ -45,6 +45,7 @@
  - bugfix [ 991070 ] 5.5.4 Editor(s) replacing ^ symbol
  - bugfix [ 1022287 ] WYSIWYG-Editor Add new web link
  - bugfix [ 1055153 ] Turn Admin ON with SSL and IE.
+ - fix [ 1118753 ] GUID not displayed in 6.2.9 if it begins with "-".
  - RFE [ 1034549 ] Docu für Encrypt Pag
  - Added internationalized URL handling.
  - Moved site icon and fav icon directly into style templates.

docs/gotcha.txt

@@ -59,6 +59,16 @@ save you many hours of grief.
  * If you have any custom code, please check out docs/migration.txt as
 	there have been many changes to the API in this release.
 
+ * There are many new components in this release, and as a result many
+	tables. Here is a list of the new tables. Make sure you have no
+	plug-ins installed that conflict with this, or tables you've
+	created for your own uses: Collaboration, Post, Thread,
+	Post_rating, Post_read, Folder, FileAsset, ITransact_recurringStatus,
+	ImageAsset, Layout, Shortcut, asset, assetHistory, commerceSettings,
+	redirect, shoppingCart, snippet, subscription, subscriptionCode, 
+	subscriptionCodeBatch, subscriptionCodeSubscriptions, transaction,
+	transactionItem
+
 
 6.2.10
 --------------------------------------------------------------------

docs/upgrades/upgrade_6.2.11-6.3.0.sql

@@ -255,9 +255,7 @@ create table Collaboration (
   karmaPerPost int not null default 0,
   collaborationTemplateId varchar(22) not null,
   threadTemplateId varchar(22) not null,
-  postTemplateId varchar(22) not null,
   postFormTemplateId varchar(22) not null,
-  postPreviewTemplateId varchar(22) not null,
   searchTemplateId varchar(22) not null,
   notificationTemplateId varchar(22) not null,
   sortBy varchar(35) not null default 'dateUpdated',
@@ -278,19 +276,18 @@ create table Collaboration (
   archiveAfter int not null default 31536000,
   postsPerPage int not null default 10,
   threadsPerPage int not null default 30,
-  subscriptionGroupId varchar(22)
+  subscriptionGroupId varchar(22),
+  allowReplies int not null default 0
 );
 
 create table Thread (
   assetId varchar(22) not null primary key,
-  views int not null default 0,
   replies int not null default 0,
   lastPostId varchar(22) not null default 0,
   lastPostDate bigint,
   isLocked int not null default 0,
   isSticky int not null default 0,
-  status varchar(30) not null default 'approved',
-  rating int not null default 0
+  subscriptionGroupId varchar(22)
 );
 
 create table Post (