From: Mark Pemberton <mpemberton5@gmail.com>
Date: Sat, 4 Jun 2011 04:38:07 +0000 (-0400)
Subject: Merge branch 'master' into privatekey2
X-Git-Tag: v0.98.0~34
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b628e63e015bc3b2eadc712feaa6c4d05cf75bbd;p=semanticscuttle.git

Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php
---

b628e63e015bc3b2eadc712feaa6c4d05cf75bbd
diff --cc doc/UPGRADE.txt
index 53ccbf4,0e570e5..1a0b964
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@@ -3,21 -4,14 +4,17 @@@ Upgrading SemanticScuttle from a previo
  
  
  From version 0.97 to 0.98
- -------------------------
- Database updates: Apply data/schema/6.sql or do the following:
- 
-     CREATE TABLE `sc_version` (
-       `schema_version` int(11) NOT NULL
-     ) DEFAULT CHARSET=utf8;
- 
-     INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
+ =========================
+ Database updates
+ ----------------
+ Apply ``data/schema/6.sql``
  
 +    ALTER TABLE `sc_users` ADD `privateKey` VARCHAR(33) NULL;
 +    CREATE UNIQUE INDEX `privateKey` ON `sc_users` (`privateKey`);
 +
  
  From version 0.96 to 0.97
- -------------------------
+ =========================
  No database changes necessary.