summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js9
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js2
-rw-r--r--scripts/builder/repository.py4
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
@@ -281,3 +281,2 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
281 281
282console.log("Record.processData", someValues);
283 this.processDataToExtractLegacyValues(someValues['data']); 282 this.processDataToExtractLegacyValues(someValues['data']);
@@ -294,4 +293,3 @@ console.log("Record.processData", someValues);
294 293
295 // community edition doesn't currently pass version 294 // community edition doesn't currently pass version information
296 // information
297 if (someValues['versions'] == null) { 295 if (someValues['versions'] == null) {
@@ -302,4 +300,5 @@ console.log("Record.processData", someValues);
302 300
303console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); 301 //- currentVersionParameters = someValues['currentVersion'];
304console.log("Record.processData - currentVersionParameters", currentVersionParameters); 302 // currentVersionParameters = someValues['versions'][someValues['currentVersion']];
303
305 currentVersionParameters['key'] = this.currentVersionKey(); 304 currentVersionParameters['key'] = this.currentVersionKey();
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
@@ -510,3 +510,3 @@ Clipperz.PM.Strings.Languages['en-us'] = {
510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ 510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
511 <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\ 511 <div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
512 </li>\ 512 </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
@@ -15,3 +15,2 @@ def repositoryWithPath (path):
15 result = GitRepository(repo, path) 15 result = GitRepository(repo, path)
16
17 except ImportError, exception: 16 except ImportError, exception:
@@ -91,3 +90,5 @@ class HgRepository(Repository):
91 90
91
92class SnapshotRepository(Repository): 92class SnapshotRepository(Repository):
93
93 def revision (self): 94 def revision (self):
@@ -95,2 +96,3 @@ class SnapshotRepository(Repository):
95 96
97
96 def areTherePendingChanges (self): 98 def areTherePendingChanges (self):