Commit Graph

38 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
289e7b16d9 build 2015-01-08 23:33:14 +08:00
9515f1e58f 打包发布最新功能 2015-01-08 22:08:09 +08:00
d24531dc78 update messages 2015-01-08 00:38:54 +08:00
2cfc89ca5f ace editor, markdown editor 2015-01-08 00:36:28 +08:00
6f12e179eb leanote beta2 release 2014-11-12 20:08:07 +08:00
4669fbcbdd leaui_image form url css 2014-11-12 19:43:42 +08:00
1f45666ec4 beta2 ok 2014-11-12 17:32:03 +08:00
346abfe91d upload file size limit [ok] 2014-11-09 18:00:23 +08:00
2f81a529fc useless js, css clear 2014-10-26 11:19:27 +08:00
e4323d0cb2 leanote v1.0 release 2014-10-23 10:52:48 +08:00
593d2c2965 v1.0 beta init 2014-10-22 16:20:45 +08:00
f16ba28a3b merge develop 2014-09-24 22:32:05 +08:00
87269cc939 Merge branch 'develop'
admin [init ok]
lea++ blog platform [ok]
2014-09-24 22:24:52 +08:00
c216e3a1ea attach fixed 2014-09-22 20:09:25 +08:00
416dd77717 init service 2014-09-22 19:15:28 +08:00
7bd5d66c55 #10, #14 2014-09-22 00:41:17 +08:00
5439c1b5fb #10 #14 2014-09-21 22:52:37 +08:00
2ddbeb5b11 #10 #14 [ok]
add attachment feature,
1) upload, delete,
2) link attach into content (include tinymce & markdown)

markdown-editor.js add insertLink function to add link into markdown
content, usage:
MarkdownEditor.insertLink(link, title)

paste plugin edit for safety image
2014-09-21 22:09:54 +08:00
ab242b10f2 paste image when edit/add shared note 2014-09-21 00:29:46 +08:00
9f89a3c717 #14 safety image 2014-09-19 17:29:24 +08:00
6f4ba8313c for safety image v1.0 #14 2014-09-19 17:18:53 +08:00
fe10dbbd77 leaui image fix bugs 2014-07-15 20:55:28 +08:00
7db9d95108 leaui image 2014-07-14 22:59:00 +08:00
91eb893814 m 2014-07-14 22:58:09 +08:00
95fe0c5289 leaui image 2014-07-08 21:45:43 +08:00
1494b25129 add leaui_image plugin for replace leanote_image. on a train to ChangSha 2014-06-28 23:07:34 +08:00
b0402f29dd markdown 2014-06-24 21:41:02 +08:00
8e05e433de blog 2014-06-24 21:14:17 +08:00
a0acd31fcf tinyce table 2014-06-17 19:46:34 +08:00
63b65920db paste image on chrome 2014-06-08 18:03:23 +08:00
c55f364153 paste image on chrome 2014-06-08 17:57:19 +08:00
5244c89987 writing mode fix 2014-05-13 17:17:13 +08:00
f0b4012118 fix markdown editor 2014-05-10 16:50:03 +08:00
0e45f2c17f editor i18n 2014-05-10 16:28:09 +08:00
3baa31d44c note i18n 2014-05-10 16:12:38 +08:00
476ade10e7 init 2014-05-07 13:06:24 +08:00