leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-15 15:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
530 Commits 24 Branches 25 Tags
ccc8983cd43d4d6269edcfe7bed79c8e7b0a0e1a
Commit Graph

81 Commits

Author SHA1 Message Date
life
ccc8983cd4 v2.2 2016-12-29 11:56:24 +08:00
life
a2f14b8e8a Merge branch 'feature-v2.2' 
#69 #202 #200 #191 #199 #171
 2016-12-28 19:43:56 +08:00
LucasYuNju
492603273f i18n 2016-12-28 17:31:50 +08:00
life
3958e0076b add tray (windows & mac) 2016-12-26 20:02:55 +08:00
life
ca24e8ef72 Merge branch 'pr/166' 
# Conflicts:
#	public/themes/default.css
 2016-09-21 18:59:57 +08:00
LucasYuNju
48519b48ad Separate tag.js it into tagNav and tagInput. 2016-09-11 16:52:23 +08:00
LucasYuNju
dd52fbd5ad Create all template strings at initialization. 2016-08-28 17:30:24 +08:00
LucasYuNju
0c28bbc057 Add view option to mac top menu. 2016-08-28 15:59:15 +08:00
LucasYuNju
8bb65c4748 Add change markdown theme to config menu. 2016-08-20 17:07:01 +08:00
life
c6865abb40 new logo 2016-05-22 22:40:28 +08:00
life
faa9f8b308 ipc new api, loadURL, image.toDataURL 2016-05-22 15:15:27 +08:00
life
15c2f75be9 upgrade to electron v1.1.1 2016-05-22 12:17:16 +08:00
life
bd4befdf95 local account warning!!! 2016-04-14 16:45:02 +08:00
life
dde71bcee2 resize md 2016-02-27 15:31:59 +08:00
life
b46e0aba3f markdown 不能预览问题 2016-01-01 21:23:35 +08:00
life
ebaf9e9107 remove ace when double delete & ace content is blank 2016-01-01 21:23:35 +08:00
life
22125ddbc2 Merge pull request #114 from imcaffrey/patch-1 
Update page.js
 2015-12-26 19:05:52 +08:00
life
09ae3f5619 add line height for ace 2015-12-25 11:22:08 +08:00
SCaffrey
d3f217a14a Update page.js 
Fix typo
 2015-12-11 22:51:45 +08:00
life
3f3c7717b6 为了解决linux下重复粘贴的问题 2015-12-01 21:55:22 +08:00
life
bbd0233466 点击内容下的a跳转 
富文本编辑器下, readonly则跳转
 2015-11-25 14:47:21 +08:00
life
165bd277d4 轻量编辑器切换完成; writting美化 
pasteImage在page.js中完成. 因为wmd-input总要是替换, 所以绑定left-column
 2015-11-25 13:32:02 +08:00
life
4bb8c5f233 登录, 创建本地帐户优化 2015-11-21 16:45:07 +08:00
life
f16e95e86f 注销账户 2015-11-21 16:10:07 +08:00
life
8c11aad97b 删除用户发事件, 打开各目录 2015-11-21 13:58:05 +08:00
life
cdb8068bd8 markdown acceptor paste image 2015-11-21 13:08:30 +08:00
life
e50b518715 用户数据分表存储 2015-11-19 17:56:53 +08:00
life
42320def54 主题优化 2015-11-19 16:17:43 +08:00
life
9f5d5079f2 开启ctrl+r, 开启开发者模式console时, cmd+r不会走这, 关了还是会走这 2015-11-15 21:54:16 +08:00
life
4a1eb9f94f 不允许cmd+r刷新, 原因是 cmd+r有问题, 刷新后, 再按cmd+r就不会执行这个了 2015-11-15 19:46:20 +08:00
life
3cd3dad1a5 clear debug 2015-11-10 13:10:09 +08:00
life
07ef7c0136 导入导出优化 2015-11-01 15:41:35 +08:00
life
661922a5c0 保存优化, 自动保存优化. 不要用isDirty, 用readOnly. 
保存时如果有错误, 用try cache, 避免笔记内容更改
 2015-10-28 15:36:24 +08:00
life
9f20e8801f cmd+e 切换readonly和writable 2015-10-28 14:53:48 +08:00
life
bd59846b0a Merge branch 'feature-batch' into pre-release 
Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js
 2015-10-26 23:16:32 +08:00
life
0824b4b32b local user fix 2015-10-24 23:55:14 +08:00
life
f931c1d203 local user. v0.8 release 2015-10-24 23:45:55 +08:00
life
0b071b7a44 批量操作时, 不能prenstation 2015-10-24 19:19:14 +08:00
life
4bb3dd5750 复制外链图片, 下载到本地 
https://github.com/leanote/desktop-app/issues/65
 2015-10-19 14:47:09 +08:00
life
6ede336b6b 帐户方便切换 
https://github.com/leanote/desktop-app/issues/66
 2015-10-19 11:06:55 +08:00
life
7bf6930c89 self.setTopDragWidth 不是总会调用 2015-10-16 18:03:50 +08:00
life
d03e9813bd replace with electron 2015-09-24 13:22:59 +08:00
life
f31f10483d Merge branch 'electron' 
Conflicts:
	.gitignore
	README.md
	src/data/version
	src/node_modules/note.js
	src/node_modules/notebook.js
	src/node_modules/web.js
	src/note.html
	src/package.json
	src/package_mac.json
	src/public/config-default.js
	src/public/js/app/native.js
	src/public/js/app/note.js
	src/public/js/app/page.js
	src/public/js/common.js
	src/public/themes/basic.less
	src/public/themes/default.css
	src/public/themes/default.less
	src/public/themes/windows.css
	src/public/themes/windows.less
	src/public/tinymce/plugins/leanote_code/plugin.js
	src/public/tinymce/plugins/leanote_code/plugin.min.js
 2015-09-24 13:19:13 +08:00
life
178a92a828 move src/* to / 2015-09-24 13:13:57 +08:00
life
faaa5230eb package 2015-03-21 23:00:52 +08:00
life
ebcab93fd7 ace编辑器优化, 同步标签问题, 一次性上传多张图片 2015-03-19 10:13:35 +08:00
life
c146d819c8 删除不要module, need time out配置. Cannot disable showInvisibles when init Ace 2015-03-18 12:13:10 +08:00
life
88be5705ad set blog 
成功后才显示blog标志, 可点
 2015-03-16 00:36:47 +08:00
life
238223d7b4 custom server 2015-03-15 22:38:35 +08:00
life
aba15ad087 笔记本数量问题 , APP端的笔记不能自动保存, APP端的笔记不能自动保存. [ok] 同步删除笔记问题 
笔记本数量问题 [ok]
两次粘贴问题 [ok]
APP端的笔记不能自动保存. [ok]
同步删除笔记问题 [ok]
        执行以下操作:APP内添加两篇笔记,手动同步到网页,网页可见.此时在网页中删掉其中一篇笔记后保存,网页可
达到预期效果.回到APP后手动同步, APP内的笔记仍然是2条,未作任何删改.已反复尝试证实. [ok]
 2015-03-15 01:34:16 +08:00