Commit Graph

101 Commits

Author SHA1 Message Date
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
decf580ed3 API, Tag 2015-03-31 14:27:26 +08:00
cbaa52e57b staticUrl -> siteUrl 2015-01-24 17:28:28 +08:00
9515f1e58f 打包发布最新功能 2015-01-08 22:08:09 +08:00
c514d0bc1c Ace & Markdown全新编辑器 & others
邀请注册
共享后图片可见问题 fileService::getFile()
笔记历史记录问题
共享后得到被共享者列表问题 shareService
themeService 博客主题新建问题, 模板循环引用问题
markdown编辑器双屏大小不能保存问题
2015-01-08 21:15:56 +08:00
2cfc89ca5f ace editor, markdown editor 2015-01-08 00:36:28 +08:00
17718732cc 国际化, #21, #26, 2014-12-09 23:17:36 +08:00
034ad821ca beta2 preNextBlog fixed 2014-11-13 16:46:22 +08:00
b45e9eacb0 beta2 preview controller 2014-11-13 12:35:48 +08:00
f503da30b7 member blog list avatar 2014-11-12 23:12:10 +08:00
6f12e179eb leanote beta2 release 2014-11-12 20:08:07 +08:00
51fedfa6dc default themes and fix notebook to blog bug 2014-11-12 19:36:31 +08:00
cd3c2f7b12 default / 2014-11-12 19:08:41 +08:00
163215d547 beta2 theme 2014-11-12 18:54:42 +08:00
1f45666ec4 beta2 ok 2014-11-12 17:32:03 +08:00
d979a0c3e2 blog, tags, archives 2014-11-10 23:56:15 +08:00
6555384e5c siteurl, adminUsername config in configService 2014-11-10 16:26:04 +08:00
954c4e5e95 for setBlog 2014-11-09 22:26:38 +08:00
e5f7c66d1e test 2014-11-09 22:14:08 +08:00
346abfe91d upload file size limit [ok] 2014-11-09 18:00:23 +08:00
2a457d6027 reset password 2014-11-09 16:54:56 +08:00
274782b89e member center, blog redesign 2014-11-09 16:24:19 +08:00
2f81a529fc useless js, css clear 2014-10-26 11:19:27 +08:00
b0b304d5dd admin username & jsonp fixed 2014-10-23 10:45:03 +08:00
1f51f6cc9b v1.0 fixed 2014-10-23 10:03:19 +08:00
593d2c2965 v1.0 beta init 2014-10-22 16:20:45 +08:00
8ae438272b change moto and delete lea 2014-10-15 17:31:27 +08:00
87269cc939 Merge branch 'develop'
admin [init ok]
lea++ blog platform [ok]
2014-09-24 22:24:52 +08:00
416dd77717 init service 2014-09-22 19:15:28 +08:00
b8ced2e1c3 donate 2014-09-22 14:06:46 +08:00
5439c1b5fb #10 #14 2014-09-21 22:52:37 +08:00
c556ab59b5 attachment feature #10 2014-09-21 22:05:04 +08:00
ab242b10f2 paste image when edit/add shared note 2014-09-21 00:29:46 +08:00
6f4ba8313c for safety image v1.0 #14 2014-09-19 17:18:53 +08:00
c142568a56 leanote's api init 2014-09-18 00:33:22 +08:00
65e84d30db new leanote router for leanote's api
/api/user/info => convert it to ApiUser.Info()
2014-09-18 00:28:23 +08:00
cdd6aa035b Merge branch 'develop'
Conflicts:
	public/css/theme/default.css
	public/css/theme/simple.css
	public/css/theme/writting-overwrite.css
	public/css/theme/writting.css
2014-09-13 13:06:53 +08:00
adf59976ec email 2014-09-12 15:39:28 +08:00
dc2435a83d add notebook, add sub notebook, delete, rename [ok] 2014-09-11 14:31:25 +08:00
2bed5b31fa add ztree to drag and sort notebooks 2014-09-10 22:44:43 +08:00
bfcf8ec547 album 2014-09-09 19:34:59 +08:00
7cbd38e8bf mgo package changed to 'gopkg.in/mgo.v2/bson' 2014-09-02 15:45:44 +08:00
bb0350fdac update leaui_image 2014-06-28 23:12:34 +08:00
1494b25129 add leaui_image plugin for replace leanote_image. on a train to ChangSha 2014-06-28 23:07:34 +08:00
8e05e433de blog 2014-06-24 21:14:17 +08:00
c55f364153 paste image on chrome 2014-06-08 17:57:19 +08:00
0929c715c0 angularjs mobile v1.0 2014-05-14 22:30:28 +08:00
ab5e5c7b76 angularjs mobile v0.1 2014-05-14 22:23:35 +08:00
4a6381bf5d register open option 2014-05-07 20:31:30 +08:00
b146dc3d5d upload image 2014-05-07 15:52:28 +08:00