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 @@ -279,7 +279,6 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { if (this.shouldProcessData()) { var currentVersionParameters; -console.log("Record.processData", someValues); this.processDataToExtractLegacyValues(someValues['data']); if (typeof(someValues['data']['notes']) != 'undefined') { @@ -292,16 +291,16 @@ console.log("Record.processData", someValues); 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)); 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 @@ -508,7 +508,7 @@ Clipperz.PM.Strings.Languages['en-us'] = {
  • Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.

  • \
  • \

    Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.

    \ -
    Clipperz Compact
    \ +
    Clipperz Compact
    \
  • \
  • Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.

  • \ \ 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 @@ -13,7 +13,6 @@ def repositoryWithPath (path): 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 @@ -89,9 +88,12 @@ class HgRepository(Repository): #=================================================================== + class SnapshotRepository(Repository): + def revision (self): return 'SNAPSHOT' + def areTherePendingChanges (self): return False