|
|
bb65ef992a
|
Note._toHtmlEntity move to common.js
|
2015-03-31 17:04:22 +08:00 |
|
|
|
ab0ee68f39
|
fix conflict
|
2015-03-31 16:56:35 +08:00 |
|
|
|
f959694b0f
|
fix conflict
|
2015-03-31 16:56:26 +08:00 |
|
|
|
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 |
|
|
|
419585ff7d
|
_toHtmlEntity 对双引号进行转义
对其他地方中有可能产生XSS的地方进行修补
|
2015-01-20 11:31:17 +08:00 |
|
|
|
ffaaa8c11a
|
对笔记的Tag中由JS创建的DOM节点在进行内容设置时对HTML进行转义
|
2015-01-20 01:15:55 +08:00 |
|
|
|
17718732cc
|
国际化, #21, #26,
|
2014-12-09 23:17:36 +08:00 |
|
|
|
8ef91b7418
|
test
|
2014-11-09 22:14:59 +08:00 |
|
|
|
e5f7c66d1e
|
test
|
2014-11-09 22:14:08 +08:00 |
|
|
|
593d2c2965
|
v1.0 beta init
|
2014-10-22 16:20:45 +08:00 |
|
|
|
84f5e9c969
|
slimscroll fixed js t() -> tt()
|
2014-09-22 20:21:58 +08:00 |
|
|
|
27dbd6552c
|
contexmenu dynamic
|
2014-09-13 00:20:18 +08:00 |
|
|
|
d1f18b9476
|
v1.0-alpha release
|
2014-09-12 21:46:03 +08:00 |
|
|
|
476ade10e7
|
init
|
2014-05-07 13:06:24 +08:00 |
|
