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
@@ -280,5 +280,4 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
                         var currentVersionParameters;
 
-console.log("Record.processData", someValues);
                         this.processDataToExtractLegacyValues(someValues['data']);
 
@@ -293,6 +292,5 @@ console.log("Record.processData", someValues);
                         }
 
-        //              community edition doesn't currently pass version
-        //              information
+        //              community edition doesn't currently pass version information
                         if (someValues['versions'] == null) {
                                 currentVersionParameters = someValues['currentVersion'];
@@ -301,6 +299,7 @@ console.log("Record.processData", someValues);
                         }
 
-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));
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
@@ -509,5 +509,5 @@ Clipperz.PM.Strings.Languages['en-us'] = {
                 <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>\
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
@@ -14,5 +14,4 @@ def repositoryWithPath (path):
                         repo = Repo(path)
                         result = GitRepository(repo, path)
-
                 except ImportError, exception:
                         print "Failed to import git, please install http://gitorious.org/git-python"
@@ -90,8 +89,11 @@ class HgRepository(Repository):
 #===================================================================
 
+
 class SnapshotRepository(Repository):
+
         def revision (self):
                 return 'SNAPSHOT'
 
+ 
         def areTherePendingChanges (self):
                 return False