Commit Graph

231 Commits

Author SHA1 Message Date
b564989214 v1.0 initial db data 2015-06-15 18:53:02 +08:00
03aa8edd58 v1.0 french lang 2015-06-15 18:24:28 +08:00
803fc90dd9 v1.0 remove unused code 2015-06-15 18:07:52 +08:00
6987a38820 v1.0
只读模式
group, 分享
评论更多问题
博客标签总是存在一个
2015-06-15 18:01:48 +08:00
12ea17e89f 编译之前修改的 2015-05-07 00:13:04 +08:00
1fd6610fa3 #133 修改默认主题, 更新markdown解析器 2015-05-07 00:02:54 +08:00
1ec28d80c8 添加markdown解析器 for blog 博客与note的markdown解析器不一致 #133 2015-05-06 23:54:44 +08:00
fcbc23e964 Ace编辑器出现XXXXXXX #132 2015-05-06 23:54:10 +08:00
8ed260976a 删除无用的.svn文件夹 2015-04-01 11:10:40 +08:00
5ebfe301f8 fix note 2015-03-31 18:16:47 +08:00
6bd6f70cbf merge dev-life 2015-03-31 18:08:21 +08:00
fbf819f4d2 merge dev-life 2015-03-31 17:29:16 +08:00
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
0b3d69e73c beta.4 initial data 2015-03-31 14:34:08 +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
ac99e20aa4 default theme clean & replace install data 2015-01-10 20:51:50 +08:00
d5dabecb81 blog theme redesign 2015-01-10 19:04:46 +08:00
df9bc37e1d blog theme redesign 2015-01-10 19:04:06 +08:00
1d18908cd0 add images 2015-01-09 00:23:33 +08:00
916ee52cdb Update conf 2015-01-09 00:13:20 +08:00
289e7b16d9 build 2015-01-08 23:33:14 +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
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
b0d4005ad6 修复在note的界面下从菜单中点退出,浏览器报错,导致退出不了的问题 2014-12-29 21:34:23 +08:00
c0cd433c3f fixed bug #5 2014-12-28 09:07:16 +08:00
792c8cfd40 medium theme 2014-12-27 23:47:31 +08:00
4f102ff883 Medium theme 2014-12-27 23:46:11 +08:00
be01c9c3f7 刷新共享笔记时有问题 2014-12-09 23:43:14 +08:00
17718732cc 国际化, #21, #26, 2014-12-09 23:17:36 +08:00
b781f8318c fixed bug #24 2014-12-07 00:31:51 +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
034ad821ca beta2 preNextBlog fixed 2014-11-13 16:46:22 +08:00
c894b7b308 beta2 google code pretty js 2014-11-13 14:21:38 +08:00
c0979be9f3 markdown table theme 2014-11-13 13:02:05 +08:00
16d47418ad beta2 default theme url title 2014-11-13 10:31:11 +08:00
5d48d1853d use urlTitle for post url 2014-11-12 23:57:50 +08:00
e2f125b253 theme data 2014-11-12 20:35:30 +08:00