summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/css/yui-extensions/basic-dialog.css6
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js10
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js2
-rw-r--r--scripts/builder/repository.py11
4 files changed, 25 insertions, 4 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css
index 2b1e20c..5a6cefb 100644
--- a/frontend/beta/css/yui-extensions/basic-dialog.css
+++ b/frontend/beta/css/yui-extensions/basic-dialog.css
@@ -24,7 +24,10 @@ refer to http://www.clipperz.com.
24*/ 24*/
25 25
26.ydlg-proxy { 26.ydlg-proxy {
27<<<<<<< HEAD
27 background-image: url(./images/default/gradient-bg.gif); 28 background-image: url(./images/default/gradient-bg.gif);
29=======
30>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
28 background-color:#c3daf9; 31 background-color:#c3daf9;
29 border:1px solid #6593cf; 32 border:1px solid #6593cf;
30 z-index:10001; 33 z-index:10001;
@@ -93,7 +96,10 @@ body.masked .ydlg select {
93 padding-right:3px; 96 padding-right:3px;
94} 97}
95.ydlg .ydlg-dlg-body{ 98.ydlg .ydlg-dlg-body{
99<<<<<<< HEAD
96 background:url(./images/default/layout/gradient-bg.gif); 100 background:url(./images/default/layout/gradient-bg.gif);
101=======
102>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
97 border:1px solid #6593cf; 103 border:1px solid #6593cf;
98 border-top:0 none; 104 border-top:0 none;
99 padding:10px; 105 padding:10px;
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index ecb6c37..d6ebb39 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -292,8 +292,14 @@ console.log("Record.processData", someValues);
292 this.setCurrentVersionKey(this.key()); 292 this.setCurrentVersionKey(this.key());
293 } 293 }
294 294
295 // currentVersionParameters = someValues['currentVersion']; 295 // community edition doesn't currently pass version
296 currentVersionParameters = someValues['versions'][someValues['currentVersion']]; 296 // information
297 if (someValues['versions'] == null) {
298 currentVersionParameters = someValues['currentVersion'];
299 } else {
300 currentVersionParameters = someValues['versions'][someValues['currentVersion']];
301 }
302
297console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); 303console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
298console.log("Record.processData - currentVersionParameters", currentVersionParameters); 304console.log("Record.processData - currentVersionParameters", currentVersionParameters);
299 currentVersionParameters['key'] = this.currentVersionKey(); 305 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 9fa95e9..299ebc7 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'] = {
508 <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>\ 508 <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>\
509 <li>\ 509 <li>\
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=\"https://www.clipperz.com/beta/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>\
513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ 513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
514 </ol>\ 514 </ol>\
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index a47e249..7ac2324 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -11,12 +11,14 @@ def repositoryWithPath (path):
11 except: 11 except:
12 try: 12 try:
13 from git import Repo 13 from git import Repo
14
15 repo = Repo(path) 14 repo = Repo(path)
16 result = GitRepository(repo, path) 15 result = GitRepository(repo, path)
16
17 except ImportError, exception: 17 except ImportError, exception:
18 print "Failed to import git, please install http://gitorious.org/git-python" 18 print "Failed to import git, please install http://gitorious.org/git-python"
19 raise exception 19 raise exception
20 except:
21 result = SnapshotRepository('', path)
20 22
21 23
22 return result 24 return result
@@ -86,3 +88,10 @@ class HgRepository(Repository):
86 88
87 89
88#=================================================================== 90#===================================================================
91
92class SnapshotRepository(Repository):
93 def revision (self):
94 return 'SNAPSHOT'
95
96 def areTherePendingChanges (self):
97 return False