| author | Clipperz <info@clipperz.com> | 2013-01-09 11:45:31 (UTC) |
|---|---|---|
| committer | Clipperz <info@clipperz.com> | 2013-01-09 11:45:31 (UTC) |
| commit | 9741a93a9f5c76827135b43c03b20c0a48f12604 (patch) (side-by-side diff) | |
| tree | 1a8fff379a033d873c9e1c7faff755fb6bb7b118 | |
| parent | 8ef30d00eb96004c39540019336c0ec99dae01cb (diff) | |
| download | clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.zip clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.gz clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.bz2 | |
Merge latest changes with public repository
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 9 | ||||
| -rw-r--r-- | frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js | 2 | ||||
| -rw-r--r-- | scripts/builder/repository.py | 4 |
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, { -console.log("Record.processData", someValues); this.processDataToExtractLegacyValues(someValues['data']); @@ -294,4 +293,3 @@ 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) { @@ -302,4 +300,5 @@ 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(); 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'] = { <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>\ 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): result = GitRepository(repo, path) - except ImportError, exception: @@ -91,3 +90,5 @@ class HgRepository(Repository): + class SnapshotRepository(Repository): + def revision (self): @@ -95,2 +96,3 @@ class SnapshotRepository(Repository): + def areTherePendingChanges (self): |