leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-20 18:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

local user. v0.8 release

Browse Source
This commit is contained in:
life
2015-10-24 23:45:55 +08:00
parent 682a694d64
commit f931c1d203
8 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/version
View File

@@ -1 +1 @@
{"version":"0.7.0.2","updatedTime":"2015-10-16T07:11:51.505Z"} {"version":"0.8","updatedTime":"2015-10-24T07:11:51.505Z"}

1
node_modules/user.js generated vendored
View File

@@ -107,6 +107,7 @@ User = {
user.IsLocal = true; user.IsLocal = true;
user.IsActive = true; user.IsActive = true;
user.UserId = Common.objectId(); user.UserId = Common.objectId();
user._id = user.UserId;
user.Pwd = Common.md5(pwd, user.UserId); user.Pwd = Common.md5(pwd, user.UserId);
db.users.insert(user, function(err, doc) { db.users.insert(user, function(err, doc) {
// 创建默认的笔记本 // 创建默认的笔记本

2
node_modules/web.js generated vendored
View File

@@ -125,7 +125,7 @@ var Web = {
// full sync // full sync
syncProcess: function(type, title) { syncProcess: function(type, title) {
var me = this; var me = this;
me.Note.syncProcess('Synchronizing ' + type + '... <br /> ' + title); me.Note.syncProcess(getMsg('Synchronizing') + ' ' + type + '... <br /> ' + title);
}, },
// inc sync // inc sync

2
note.html
View File

@@ -378,7 +378,7 @@ function log(o) {
<!-- 由此可以算高度 --> <!-- 由此可以算高度 -->
<div id="editorContentWrap"> <div id="editorContentWrap">
<div id="editorContent" name="editorContent" tabindex="2" > <div id="editorContent" name="editorContent" tabindex="2" >
{{.noteContent}} Loading...
</div> </div>
</div> </div>
</div> </div>

2
public/config.js
View File

@@ -20,6 +20,6 @@ var Config = {
"name": "繁体中文" "name": "繁体中文"
} }
], ],
"lang": "zh-hk", "lang": "en-us",
"theme": "" "theme": ""
}; };

6
public/js/app/page.js
View File

@@ -2010,6 +2010,7 @@ function userMenu(allUsers) {
}); });
this.menu.append(this.blog); this.menu.append(this.blog);
} }
this.menu.append(new gui.MenuItem({ type: 'separator' }));
this.menu.append(this.switchAccount); this.menu.append(this.switchAccount);
this.menu.append(allUsersMenu); this.menu.append(allUsersMenu);
this.menu.append(new gui.MenuItem({ type: 'separator' })); this.menu.append(new gui.MenuItem({ type: 'separator' }));
@@ -2020,7 +2021,10 @@ function userMenu(allUsers) {
this.menu.append(themeMenu); this.menu.append(themeMenu);
} }
var height = 210; var height = 230;
if (UserInfo.IsLocal) {
height = 200;
}
if(!isMac()) { if(!isMac()) {
this.menu.append(new gui.MenuItem({ type: 'separator' })); this.menu.append(new gui.MenuItem({ type: 'separator' }));

4
public/langs/zh-cn.js
View File

@@ -278,6 +278,8 @@
"Confirm password": "确认密码", "Confirm password": "确认密码",
"Username": "用户名", "Username": "用户名",
"User exists": "用户已存在", "User exists": "用户已存在",
"Local": "本地" "Local": "本地",
"Synchronizing": "正在同步"
} }

3
public/langs/zh-hk.js
View File

@@ -278,6 +278,7 @@
"Confirm password": "確認密碼", "Confirm password": "確認密碼",
"Username": "用戶名", "Username": "用戶名",
"User exists": "用戶已存在", "User exists": "用戶已存在",
"Local": "本地" "Local": "本地",
"Synchronizing": "正在同步"
} }