leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-15 07:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
266 Commits 24 Branches 25 Tags
0429e7a0bb15d1d1535a3f60d6514114f60cea96
Commit Graph

38 Commits

Author SHA1 Message Date
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
01f59cecac img save as & notification 2015-03-20 00:35:19 +08:00
life
238223d7b4 custom server 2015-03-15 22:38:35 +08:00
life
2b809fd377 sync, 当前笔记冲突问题 
sync当前笔记时,
1) 把服务器上的content->本地
2) changeNote此时会触发saveContent, 此时拿之前的content与新的content对比, 所以导致isDirty
 2015-03-14 14:17:02 +08:00
life
5527cd6d47 fix for windows & linux 2015-03-12 15:34:05 +08:00
life
67dfd94730 login, readme 2015-03-09 15:36:04 +08:00
life
67f35279ff fix open url in app 2015-03-08 03:33:40 +08:00
life
49bec63ded 写作模式, sync问题 2015-03-08 01:52:30 +08:00
life
4a48b11a10 prensataion tool ok 2015-03-07 12:56:20 +08:00
life
a836aa5a1f presentation, fullscreen toggle; user state; animation loading; 2015-03-06 22:13:27 +08:00
life
b8fc9c6df4 初始OK 2015-03-05 00:29:58 +08:00
life
9681486db2 close, left style 2015-03-04 22:03:24 +08:00
life
918d8c2e40 save/recover state 2015-03-04 21:50:20 +08:00
life
94f39da8b9 simple, blue, black三种配色 2015-03-04 01:20:54 +08:00
life
c2adc45da6 UI && copy image on web 
FileReader只能在web端, 不能在nodejs端, 之前可以的啊?
 2015-03-02 21:56:42 +08:00
life
120ab4e439 markdown edtior 问题 图片上传 [ok] tab切换到内容编辑 [ok] 2015-03-01 21:46:21 +08:00
life
6df80d2fed sync 2015-02-27 22:29:38 +08:00
life
a59c2fcadd notebook sync ok 2015-02-19 22:39:05 +08:00
life
968637ba89 ok 2015-02-19 20:19:51 +08:00
life
07e2b43755 login.html page 2015-02-17 23:56:21 +08:00
life
6983a6004b scroll bar style 2015-02-14 12:02:21 +08:00
life
ec4841a59d conflict fixed 2015-02-13 11:43:49 +08:00
life
faeb923b2a conflict resolved ing 2015-02-12 19:40:22 +08:00
life
269f68620c 网络断开时, auth检查 
sync还有问题
 2015-02-11 23:50:02 +08:00
life
78316190e9 布局优化, tag放到最后, confict按钮, 
TODO, confict按钮点击显示冲突信息, 并有按钮标记解决冲突, 与查看与之总之的笔记
 2015-02-10 19:05:58 +08:00
life
b7b5d241f7 switch account 2015-02-08 22:07:20 +08:00
life
b1cbb19b2b starred 2015-02-08 18:41:47 +08:00
life
11b6e7bc99 Notebook 操作 
Notebook
     添加/子 [ok]
     重命名 [ok]
     移动 [ok]
     删除 [ok]
     list trash [ok]
Note
     add [todo, markdown]
     delete [ok]
     deleteTrash [ok]
 2015-02-07 22:44:42 +08:00
life
19eb994845 基本样式修改 2015-02-06 21:04:54 +08:00
life
647ca66fa5 conflict ok 
todo conflict copy attach
 2015-02-01 01:07:40 +08:00
life
00aac7c96a sync attach [ok] 
todo conflicts copy attach
 2015-01-31 22:04:20 +08:00
life
4a78441cad 上传文件 
Note表是否要有Attachs信息呢? 还是只要一个attachNum ?
 2015-01-30 00:04:22 +08:00
life
256ebb6363 本地添加图片成功, add resource 待完善 2015-01-28 00:38:34 +08:00
life
93e5d7be6e incr 同步完成, 待send changes 2015-01-24 14:41:24 +08:00
life
245bbb0236 图片同步 
未解决: 从本地获取
 2015-01-23 20:43:21 +08:00