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
407e4c3ac4
笔记的Tag中不允许出现换行符
2015-01-20 14:08:52 +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
014a141808
修复当笔记的Title中有HTML代码时,会被页面解析的问题
2015-01-20 00:06:36 +08:00
52d0a7ed21
delete medium theme
2015-01-08 23:27:13 +08:00
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
2cfc89ca5f
ace editor, markdown editor
2015-01-08 00:36:28 +08:00
c0cd433c3f
fixed bug #5
2014-12-28 09:07:16 +08:00
be01c9c3f7
刷新共享笔记时有问题
2014-12-09 23:43:14 +08:00
17718732cc
国际化, #21 , #26 ,
2014-12-09 23:17:36 +08:00
ed75704032
添加默认笔记本，默认笔记本无法删除。修改初始化数据添加默认笔记本数据。修改bug #23
2014-12-07 00:12:17 +08:00
c49593171c
note
2014-12-02 23:20:10 +08:00
45d72051d0
Note
2014-12-02 23:19:43 +08:00
9bc65bc099
compatible for iPhone/ipad; writing mode for ipad/iphone
2014-12-02 22:42:46 +08:00
6f12e179eb
leanote beta2 release
2014-11-12 20:08:07 +08:00
8ef91b7418
test
2014-11-09 22:14:59 +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
274782b89e
member center, blog redesign
2014-11-09 16:24:19 +08:00
593d2c2965
v1.0 beta init
2014-10-22 16:20:45 +08:00
9db1164fe0
merge develop
2014-09-24 22:31:53 +08:00
87269cc939
Merge branch 'develop'
...
admin [init ok]
lea++ blog platform [ok]
2014-09-24 22:24:52 +08:00
99956cfd72
fix animation when toggle writing mod
2014-09-24 10:06:30 +08:00
cff6efde91
common page & animation
2014-09-23 18:56:04 +08:00
2221f146de
fix TinyMCE Removes site base url
2014-09-22 22:45:57 +08:00
1fea36a7c1
fix
2014-09-22 22:43:33 +08:00
95af247cdc
attach fix download url
2014-09-22 22:31:56 +08:00
5a2274328b
attach fix download url
2014-09-22 22:26:50 +08:00
84f5e9c969
slimscroll fixed js t() -> tt()
2014-09-22 20:21:58 +08:00
b4f0a08b9f
attach fixed
2014-09-22 20:09:12 +08:00
b411302087
file size
2014-09-22 00:58:43 +08:00
7bd5d66c55
#10 , #14
2014-09-22 00:41:17 +08:00
5439c1b5fb
#10 #14
2014-09-21 22:52:37 +08:00
320c79e7a3
#10 #14
2014-09-21 22:20:00 +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
c556ab59b5
attachment feature #10
2014-09-21 22:05:04 +08:00
6f4ba8313c
for safety image v1.0 #14
2014-09-19 17:18:53 +08:00
b41101e073
release v1.0
2014-09-13 13:25:49 +08:00
138dfa904c
fix
2014-09-13 12:54:56 +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
8dd5239a8a
default theme [ok]
2014-09-12 21:40:14 +08:00
e6fb6e3f09
all is ok, waitting to edit default theme
2014-09-12 20:42:40 +08:00
52010e4fc1
share notebook [ok]
2014-09-12 20:31:14 +08:00
f30430bc63
before sharenotebooks
2014-09-12 15:32:19 +08:00
a113b9b5e5
item setting [ok]
...
notebook icon [ok]
2014-09-12 11:50:24 +08:00
