xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
449 Commits 1 Branch 0 Tags
3d1a32764d0d6ce7578fb2568a943a0a489706fe
Commit Graph

449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
life
5fae5dd10e Merge branch 'dev-life' into dev 
Conflicts:
	app/init.go
	app/service/UserService.go
	conf/app.conf
	conf/routes
	mongodb_backup/leanote_install_data/albums.metadata.json
	mongodb_backup/leanote_install_data/attachs.metadata.json
	mongodb_backup/leanote_install_data/blog_comments.metadata.json
	mongodb_backup/leanote_install_data/blog_likes.metadata.json
	mongodb_backup/leanote_install_data/blog_singles.metadata.json
	mongodb_backup/leanote_install_data/configs.bson
	mongodb_backup/leanote_install_data/configs.metadata.json
	mongodb_backup/leanote_install_data/email_logs.metadata.json
	mongodb_backup/leanote_install_data/files.metadata.json
	mongodb_backup/leanote_install_data/find_pwds.metadata.json
	mongodb_backup/leanote_install_data/group_users.metadata.json
	mongodb_backup/leanote_install_data/groups.metadata.json
	mongodb_backup/leanote_install_data/has_share_notes.metadata.json
	mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json

mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.jso
n

mongodb_backup/leanote_install_data/note_content_histories.metadata.json
	mongodb_backup/leanote_install_data/note_contents.metadata.json
	mongodb_backup/leanote_install_data/note_images.metadata.json
	mongodb_backup/leanote_install_data/notebooks.bson
	mongodb_backup/leanote_install_data/notebooks.metadata.json
	mongodb_backup/leanote_install_data/notes.bson
	mongodb_backup/leanote_install_data/notes.metadata.json
	mongodb_backup/leanote_install_data/reports.metadata.json
	mongodb_backup/leanote_install_data/sessions.metadata.json
	mongodb_backup/leanote_install_data/share_notebooks.metadata.json
	mongodb_backup/leanote_install_data/share_notes.metadata.json
	mongodb_backup/leanote_install_data/suggestions.metadata.json
	mongodb_backup/leanote_install_data/system.indexes.bson
	mongodb_backup/leanote_install_data/tag_count.metadata.json
	mongodb_backup/leanote_install_data/tags.metadata.json
	mongodb_backup/leanote_install_data/themes.metadata.json
	mongodb_backup/leanote_install_data/tokens.metadata.json
	mongodb_backup/leanote_install_data/user_blogs.metadata.json
	mongodb_backup/leanote_install_data/users.bson
	mongodb_backup/leanote_install_data/users.metadata.json
	public/blog/themes/default/theme.json
	public/blog/themes/elegant/theme.json
	public/blog/themes/nav_fixed/theme.json
	public/images/logo/leanote_icon_blue.jpg
	public/js/app/note-min.js
	public/js/app/note.js
	public/js/app/notebook-min.js
	public/js/app/notebook.js
	public/js/app/tag-min.js
	public/js/app/tag.js
	public/tinymce/plugins/paste/plugin.dev.js
	public/tinymce/plugins/spellchecker/plugin.min.js
	public/tinymce/tinymce.dev.js
	public/tinymce/tinymce.jquery.dev.js
 2015-03-31 16:18:22 +08:00
life
9aacba4c31 conf 2015-03-31 14:39:03 +08:00
life
e47dc0dc18 beta.4 initial data 2015-03-31 14:34:54 +08:00
life
0b3d69e73c beta.4 initial data 2015-03-31 14:34:08 +08:00
life
decf580ed3 API, Tag 2015-03-31 14:27:26 +08:00
Refactoring
e186cf984c #96 实现组内的任何一个人都可以分享内容到这个组中. 
存在不足：共享内容以分享者进行归类组织.  更好的内容组织方式：共享给组的以组归类组织，共享给个人的以分享者个人组织
 2015-03-30 20:19:48 +08:00
life
3b1d9e6a73 Merge pull request #95 from Deathis/dev 
修复移动端用户头像不是绝对地址导致某些情况地址错误的问题
 2015-03-29 00:14:18 +08:00
Deathis
cb218086f3 修复移动端用户头像不是绝对地址导致某些情况地址错误的问题 
将用户头像设置成绝对地址
 2015-03-28 23:42:53 +08:00
Refactoring
0f7ebb6c53 fix bug: Email validation missing contains "-" 
example: name1-name2@site.com, name@site1-site2.com
 2015-03-27 14:56:37 +08:00
leanote
257a141519 Update README_zh.md 2015-03-05 17:27:15 +08:00
leanote
12bc62e990 Update README.md 2015-03-05 17:26:24 +08:00
leanote
fbeecdf062 Update README.md 2015-03-05 17:25:20 +08:00
leanote
1e0fd166db Update README.md 
Leanote V1.0.3-beta bin url
 2015-03-05 17:24:29 +08:00
dds_feng
2484abe7cf Merge branch 'dev-xqin' into dev 2015-01-24 17:31:18 +08:00
dds_feng
cbaa52e57b staticUrl -> siteUrl 2015-01-24 17:28:28 +08:00
yfqin
407e4c3ac4 笔记的Tag中不允许出现换行符 2015-01-20 14:08:52 +08:00
yfqin
8a61b64575 Merge branch 'dev-xqin' into dev 2015-01-20 13:13:58 +08:00
yfqin
419585ff7d _toHtmlEntity 对双引号进行转义 
对其他地方中有可能产生XSS的地方进行修补
 2015-01-20 11:31:17 +08:00
dds_feng
ffaaa8c11a 对笔记的Tag中由JS创建的DOM节点在进行内容设置时对HTML进行转义 2015-01-20 01:15:55 +08:00
dds_feng
3417e71d04 Merge branch 'dev-xqin' into dev 2015-01-20 00:07:19 +08:00
dds_feng
014a141808 修复当笔记的Title中有HTML代码时,会被页面解析的问题 2015-01-20 00:06:36 +08:00
life
9803249ab1 Update app.conf 2015-01-13 20:04:05 +08:00
life
ac99e20aa4 default theme clean & replace install data 2015-01-10 20:51:50 +08:00
life
d5dabecb81 blog theme redesign 2015-01-10 19:04:46 +08:00
life
df9bc37e1d blog theme redesign 2015-01-10 19:04:06 +08:00
life
4277caa571 initial data, add index to notes 2015-01-09 00:32:34 +08:00
life
1d18908cd0 add images 2015-01-09 00:23:33 +08:00
life
916ee52cdb Update conf 2015-01-09 00:13:20 +08:00
life
289e7b16d9 build 2015-01-08 23:33:14 +08:00
life
016ef5de2d delete app.conf-default, routes-default 2015-01-08 23:29:24 +08:00
life
52d0a7ed21 delete medium theme 2015-01-08 23:27:13 +08:00
life
ddf3236c4f Merge branch 'dev-life' 
Conflicts:
	app/init.go
	public/js/common-min.js
	public/js/common.js
 2015-01-08 23:14:27 +08:00
life
9515f1e58f 打包发布最新功能 2015-01-08 22:08:09 +08:00
life
c514d0bc1c Ace & Markdown全新编辑器 & others 
邀请注册
共享后图片可见问题 fileService::getFile()
笔记历史记录问题
共享后得到被共享者列表问题 shareService
themeService 博客主题新建问题, 模板循环引用问题
markdown编辑器双屏大小不能保存问题
 2015-01-08 21:15:56 +08:00
life
d24531dc78 update messages 2015-01-08 00:38:54 +08:00
life
2cfc89ca5f ace editor, markdown editor 2015-01-08 00:36:28 +08:00
dds_feng
b0d4005ad6 修复在note的界面下从菜单中点退出,浏览器报错,导致退出不了的问题 2014-12-29 21:34:23 +08:00
asktalk
c0cd433c3f fixed bug #5 2014-12-28 09:07:16 +08:00
asktalk
792c8cfd40 medium theme 2014-12-27 23:47:31 +08:00
asktalk
4f102ff883 Medium theme 2014-12-27 23:46:11 +08:00
asktalk
40973c4615 modify the product publicity picture 2014-12-27 23:32:32 +08:00
asktalk
58bf623d05 edit readme 2014-12-27 23:28:03 +08:00
asktalk
46e97abe91 edit readme 2014-12-27 23:25:32 +08:00
life
be01c9c3f7 刷新共享笔记时有问题 2014-12-09 23:43:14 +08:00
life
17718732cc 国际化, #21, #26, 2014-12-09 23:17:36 +08:00
life
e2e90f8618 Merge branch 'master' of github.com:leanote/leanote 2014-12-07 22:05:30 +08:00
life
25d5df6bfc update readme 2014-12-07 22:02:01 +08:00
asktalk
b781f8318c fixed bug #24 2014-12-07 00:31:51 +08:00
asktalk
0e07cbab8b updated README.md 2014-12-07 00:23:00 +08:00
asktalk
ed75704032 添加默认笔记本，默认笔记本无法删除。修改初始化数据添加默认笔记本数据。修改bug #23 2014-12-07 00:12:17 +08:00