From 69d0ef4ff52f5d872dcab294bd6b3b84148f74ba Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 3 May 2011 19:17:28 +0200
Subject: update changelog

---
 doc/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/ChangeLog b/doc/ChangeLog
index a7374e2..98ca4b2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -13,6 +13,7 @@ ChangeLog for SemantiScuttle
 - Update php-gettext library to 1.0.10
 - api/posts/add respects the "replace" parameter now
 - Fix privacy issue when fetching tags of several users
+- Only URLs with an allowed protocol may be added to the database
 
 
 0.97.2 - 2011-02-17
-- 
cgit v1.2.3-54-g00ecf


From e2c4b53ecb1b52a91249562b0e34b24f5e4d8d3e Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 3 May 2011 19:21:26 +0200
Subject: update changelog; bug #3251877 has been fixed with the query switch

---
 doc/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 98ca4b2..dacee5a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle
 - Fix bug #3187177: Wrong URL / Export XML Bookmarks
 - Fix bug in getTagsForBookmarks() that fetched all tags
 - Fix bug #3097187: Using opensearch with two tags does not work in Firefox
+- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks
 - Implement request #3054906: Show user's full name instead of nickname
 - Implement patch #3059829: update FR_CA translation
 - Show error message on mysqli connection errors
-- 
cgit v1.2.3-54-g00ecf


From 69e58d8632198cf3eb39317d9382007731a10141 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 4 May 2011 07:24:52 +0200
Subject: Support HTTPS connections when $root is not configured

---
 doc/ChangeLog                     | 1 +
 src/SemanticScuttle/constants.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ChangeLog b/doc/ChangeLog
index dacee5a..d9b6f57 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog for SemantiScuttle
 - api/posts/add respects the "replace" parameter now
 - Fix privacy issue when fetching tags of several users
 - Only URLs with an allowed protocol may be added to the database
+- Support HTTPS connections when $root is not configured
 
 
 0.97.2 - 2011-02-17
diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php
index b023840..f8567d9 100644
--- a/src/SemanticScuttle/constants.php
+++ b/src/SemanticScuttle/constants.php
@@ -41,7 +41,10 @@ if (!isset($GLOBALS['root'])) {
         $rootTmp .= '/';
     }
 
-    define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp);
+    //we do not prepend http since we also want to support https connections
+    // "http" is not required; it's automatically determined by the browser
+    // depending on the current connection.
+    define('ROOT', '//'. $_SERVER['HTTP_HOST'] . $rootTmp);
 } else {
     define('ROOT', $GLOBALS['root']);
 }
-- 
cgit v1.2.3-54-g00ecf


From dda05f5cc7e1d984564e5154f6ceda762c2224a3 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 4 May 2011 08:02:33 +0200
Subject: SQL schema version table to ease future database upgrades

---
 data/schema/6.sql |  4 ++++
 data/tables.sql   |  8 +++++++-
 doc/ChangeLog     |  1 +
 doc/UPGRADE.txt   | 11 +++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 data/schema/6.sql

(limited to 'doc')

diff --git a/data/schema/6.sql b/data/schema/6.sql
new file mode 100644
index 0000000..4ae7cb9
--- /dev/null
+++ b/data/schema/6.sql
@@ -0,0 +1,4 @@
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
diff --git a/data/tables.sql b/data/tables.sql
index c61c2f5..7a9c5bd 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -182,4 +182,10 @@ CREATE TABLE `sc_votes` (
   UNIQUE KEY `bid_2` (`bId`,`uId`),
   KEY `bid` (`bId`),
   KEY `uid` (`uId`)
-) CHARACTER SET utf8 COLLATE utf8_general_ci ;
\ No newline at end of file
+) CHARACTER SET utf8 COLLATE utf8_general_ci ;
+
+
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d9b6f57..a54e71e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -16,6 +16,7 @@ ChangeLog for SemantiScuttle
 - Fix privacy issue when fetching tags of several users
 - Only URLs with an allowed protocol may be added to the database
 - Support HTTPS connections when $root is not configured
+- SQL schema version table to ease future database upgrades
 
 
 0.97.2 - 2011-02-17
diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index c4470f9..3be6654 100644
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -2,6 +2,17 @@ Upgrading SemanticScuttle from a previous version
 =================================================
 
 
+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');
+
+
 From version 0.96 to 0.97
 -------------------------
 No database changes necessary.
-- 
cgit v1.2.3-54-g00ecf