Merge latest changes with public repository

3 files changed, 8 insertions, 7 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index d6ebb39..f89f79c 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -276,35 +276,34 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
 	'processData': function(someValues) {
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues));
 		if (this.shouldProcessData()) {
 			var currentVersionParameters;
 
-console.log("Record.processData", someValues);
 			this.processDataToExtractLegacyValues(someValues['data']);
 
 			if (typeof(someValues['data']['notes']) != 'undefined') {
 				this.setNotes(someValues['data']['notes']);
 			}
 
 			if (someValues['data']['currentVersionKey'] != null) {
 				this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
 			} else {
 				this.setCurrentVersionKey(this.key());
 			}
 
-//			community edition doesn't currently pass version
-//			information
+//			community edition doesn't currently pass version information
 			if (someValues['versions'] == null) {
 				currentVersionParameters = someValues['currentVersion'];
 			} else {
 				currentVersionParameters = someValues['versions'][someValues['currentVersion']];
 			}
 
-console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
-console.log("Record.processData - currentVersionParameters", currentVersionParameters);
+//-			currentVersionParameters = someValues['currentVersion'];
+//			currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+
 			currentVersionParameters['key'] = this.currentVersionKey();
 			this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
 			
 			if (someValues['data']['directLogins'] != null) {
 				var	directLoginReference;
 			
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
index 299ebc7..ab1bb0f 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -505,13 +505,13 @@ Clipperz.PM.Strings.Languages['en-us'] = {
 	\
 	<h3>How to launch Clipperz Compact in the sidebar</h3>\
 	<ol>\
 		<li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\
 		<li>\
 			<p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
-			<div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
+			<div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
 		</li>\
 		<li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
 	</ol>\
 	\
 	<h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>",
 
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7ac2324..7a44e47 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -10,13 +10,12 @@ def repositoryWithPath (path):
 		result = HgRepository(repo, path)
 	except:
 		try:
 			from git import Repo
 			repo = Repo(path)
 			result = GitRepository(repo, path)
-
 		except ImportError, exception:
 			print "Failed to import git, please install http://gitorious.org/git-python"
 			raise exception
 		except:
 			result = SnapshotRepository('', path)
 
@@ -86,12 +85,15 @@ class HgRepository(Repository):
 		# TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
 		return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
 
 
 #===================================================================
 
+
 class SnapshotRepository(Repository):
+
 	def revision (self):
 		return 'SNAPSHOT'
 
+ 
 	def areTherePendingChanges (self):
 		return False