clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 18:39:01 +01:00
Code Issues Releases Wiki Activity

Merge latest changes with public repository

Browse Source
This commit is contained in:
Clipperz 2013-01-09 12:45:31 +01:00
parent 8ef30d00eb
commit 9741a93a9f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/beta/js/Clipperz/PM/DataModel/Record.js
View File

@ -279,7 +279,6 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
if (this.shouldProcessData()) { if (this.shouldProcessData()) {
var currentVersionParameters; var currentVersionParameters;
console.log("Record.processData", someValues);
this.processDataToExtractLegacyValues(someValues['data']); this.processDataToExtractLegacyValues(someValues['data']);
if (typeof(someValues['data']['notes']) != 'undefined') { if (typeof(someValues['data']['notes']) != 'undefined') {
@ -292,16 +291,16 @@ console.log("Record.processData", someValues);
this.setCurrentVersionKey(this.key()); this.setCurrentVersionKey(this.key());
} }
// community edition doesn't currently pass version // community edition doesn't currently pass version information
// information
if (someValues['versions'] == null) { if (someValues['versions'] == null) {
currentVersionParameters = someValues['currentVersion']; currentVersionParameters = someValues['currentVersion'];
} else { } else {
currentVersionParameters = someValues['versions'][someValues['currentVersion']]; currentVersionParameters = someValues['versions'][someValues['currentVersion']];
} }
console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); //- currentVersionParameters = someValues['currentVersion'];
console.log("Record.processData - currentVersionParameters", currentVersionParameters); // currentVersionParameters = someValues['versions'][someValues['currentVersion']];
currentVersionParameters['key'] = this.currentVersionKey(); currentVersionParameters['key'] = this.currentVersionKey();
this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));

2
frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
View File

@ -508,7 +508,7 @@ Clipperz.PM.Strings.Languages['en-us'] = {
<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>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>\ <li>\
<p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ <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>\
<li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
</ol>\ </ol>\

4
scripts/builder/repository.py
View File

@ -13,7 +13,6 @@ def repositoryWithPath (path):
from git import Repo from git import Repo
repo = Repo(path) repo = Repo(path)
result = GitRepository(repo, path) result = GitRepository(repo, path)
except ImportError, exception: except ImportError, exception:
print "Failed to import git, please install http://gitorious.org/git-python" print "Failed to import git, please install http://gitorious.org/git-python"
raise exception raise exception
@ -89,9 +88,12 @@ class HgRepository(Repository):
#=================================================================== #===================================================================
class SnapshotRepository(Repository): class SnapshotRepository(Repository):
def revision (self): def revision (self):
return 'SNAPSHOT' return 'SNAPSHOT'
def areTherePendingChanges (self): def areTherePendingChanges (self):
return False return False