Commit Graph

521 Commits

Author SHA1 Message Date
68eaac9622 mongo3 dont't have --directoryperdb option;
Just append dumpPath by the end of the command is capable for both mongo2 and 3
2015-04-02 10:43:46 +08:00
a089292461 fix restore/backup bug: mongo -port to --port 2015-04-02 10:18:59 +08:00
b59eba4ca4 Merge pull request #104 from Refactoring/master
实现组内人员可分享内容至这个组
2015-04-02 09:43:12 +08:00
8e52074346 Merge pull request #105 from goodbest/patch-2
add missing key for notebook
2015-04-02 09:38:08 +08:00
4fb7e8dbaa add missing key for notebook 2015-04-01 12:54:37 +08:00
8ed260976a 删除无用的.svn文件夹 2015-04-01 11:10:40 +08:00
d8dac67913 Merge remote-tracking branch 'masterfork/master'
Conflicts:
	app/lea/Util.go
	public/js/common-min.js
	public/js/common.js
2015-04-01 08:55:08 +08:00
ade77bba58 Update app.conf 2015-03-31 18:34:45 +08:00
849118f9b8 update api doc 2015-03-31 18:27:53 +08:00
f0b45deaec Merge branch 'dev' 2015-03-31 18:17:57 +08:00
5ebfe301f8 fix note 2015-03-31 18:16:47 +08:00
801263f50c Merge branch 'dev' 2015-03-31 18:13:21 +08:00
6bd6f70cbf merge dev-life 2015-03-31 18:08:21 +08:00
f38a86cb07 v1.0-beta.4 fix conflict 2015-03-31 18:00:49 +08:00
f755574576 Merge branch 'dev'
Conflicts:
	conf/app.conf
2015-03-31 17:59:16 +08:00
d568c286d5 initial db data 2015-03-31 17:57:10 +08:00
cbf5c7f941 initial db data 2015-03-31 17:56:58 +08:00
ce0e099bbd fix conflicts 2015-03-31 17:52:18 +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
9aacba4c31 conf 2015-03-31 14:39:03 +08:00
e47dc0dc18 beta.4 initial data 2015-03-31 14:34:54 +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
e186cf984c #96 实现组内的任何一个人都可以分享内容到这个组中.
存在不足:共享内容以分享者进行归类组织.  更好的内容组织方式:共享给组的以组归类组织,共享给个人的以分享者个人组织
2015-03-30 20:19:48 +08:00
3b1d9e6a73 Merge pull request #95 from Deathis/dev
修复移动端用户头像不是绝对地址导致某些情况地址错误的问题
2015-03-29 00:14:18 +08:00
cb218086f3 修复移动端用户头像不是绝对地址导致某些情况地址错误的问题
将用户头像设置成绝对地址
2015-03-28 23:42:53 +08:00
0f7ebb6c53 fix bug: Email validation missing contains "-"
example: name1-name2@site.com, name@site1-site2.com
2015-03-27 14:56:37 +08:00
257a141519 Update README_zh.md 2015-03-05 17:27:15 +08:00
12bc62e990 Update README.md 2015-03-05 17:26:24 +08:00
fbeecdf062 Update README.md 2015-03-05 17:25:20 +08:00
1e0fd166db Update README.md
Leanote V1.0.3-beta bin url
2015-03-05 17:24:29 +08:00
2484abe7cf Merge branch 'dev-xqin' into dev 2015-01-24 17:31:18 +08:00
cbaa52e57b staticUrl -> siteUrl 2015-01-24 17:28:28 +08:00
407e4c3ac4 笔记的Tag中不允许出现换行符 2015-01-20 14:08:52 +08:00
8a61b64575 Merge branch 'dev-xqin' into dev 2015-01-20 13:13:58 +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
3417e71d04 Merge branch 'dev-xqin' into dev 2015-01-20 00:07:19 +08:00
014a141808 修复当笔记的Title中有HTML代码时,会被页面解析的问题 2015-01-20 00:06:36 +08:00
9803249ab1 Update app.conf 2015-01-13 20:04:05 +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
4277caa571 initial data, add index to notes 2015-01-09 00:32:34 +08:00
1d18908cd0 add images 2015-01-09 00:23:33 +08:00
916ee52cdb Update conf 2015-01-09 00:13:20 +08:00