Commit Graph
100 Commits
Author SHA1 Message Date
life 5838cc218f Merge pull request #180 from ZhuangER/yu-huang
Fix a nav bar's bug
2015-08-29 13:23:09 +08:00
lealife 6e7c1e0d41 add chat room 2015-08-27 10:25:05 +08:00
lealife 6a0a60a644 update readme 2015-08-21 23:52:28 +08:00
lealife 94f9c2c3cb update readme 2015-08-20 23:42:12 +08:00
lealife 37e7ed8d14 update readme 2015-08-20 23:37:55 +08:00
lealife 4227c80ec7 Merge branch 'master' of github.com:leanote/leanote
merge it
2015-08-20 23:34:46 +08:00
lealife 6ec6ef698b add qq group2 2015-08-20 23:30:46 +08:00
life 0543dd015e Merge pull request #159 from alexsourcerer/patch-6
Update msg.fr
2015-07-13 18:22:28 +08:00
lealife fc517700cc v1.0 release.sh 2015-06-15 19:47:22 +08:00
lealife b5e0cd31dd v1.0 reset app.conf 2015-06-15 19:13:59 +08:00
lealife ab4b8b77a3 v1.0 use revel 0.12 2015-06-15 19:13:00 +08:00
lealife 04c339896b v1.0 preview 2015-06-15 18:55:33 +08:00
lealife e37056737d v1.0 preview 2015-06-15 18:55:07 +08:00
lealife 89f8bb934c v1.0 initial db data 2015-06-15 18:53:10 +08:00
lealife b564989214 v1.0 initial db data 2015-06-15 18:53:02 +08:00
lealife 03aa8edd58 v1.0 french lang 2015-06-15 18:24:28 +08:00
lealife 803fc90dd9 v1.0 remove unused code 2015-06-15 18:07:52 +08:00
lealife 6987a38820 v1.0
只读模式
group, 分享
评论更多问题
博客标签总是存在一个
2015-06-15 18:01:48 +08:00
lealife 7e458bb433 分享给项目组无法输出已设置项目组 #143 2015-05-21 20:49:58 +08:00
lealife b391375008 font-awesome.css找不到 #140 2015-05-14 19:23:56 +08:00
lealife 3f89e1cf83 update readme 2015-05-10 15:10:56 +08:00
lealife 9f5dc8a0e2 update readme 2015-05-10 15:07:51 +08:00
lealife 12ea17e89f 编译之前修改的 2015-05-07 00:13:04 +08:00
lealife 1fd6610fa3 #133 修改默认主题, 更新markdown解析器 2015-05-07 00:02:54 +08:00
lealife 1ec28d80c8 添加markdown解析器 for blog 博客与note的markdown解析器不一致 #133 2015-05-06 23:54:44 +08:00
lealife fcbc23e964 Ace编辑器出现XXXXXXX #132 2015-05-06 23:54:10 +08:00
lealife 6fba2a6416 test for commit 2015-05-06 23:39:56 +08:00
life 5726df1a81 update read 2015-05-03 12:32:16 +08:00
life f3a0a786c5 release 2015-04-20 20:51:03 +08:00
life fa08b3393a restore dbname 2015-04-20 19:52:13 +08:00
life 5db148be9f release for windows 2015-04-20 19:51:20 +08:00
life d03cce2761 initial db data fixed 2015-04-08 14:01:34 +08:00
life 3a0bdd803d initial data fixed 2015-04-08 14:01:24 +08:00
life d1b6dddfd0 readme 2015-04-07 20:34:09 +08:00
life 2676c5a85d Readme 2015-04-07 20:32:50 +08:00
life bde731d84c Merge pull request #108 from goodbest/patch-3
fix restore/backup bug: mongo -port to --port
2015-04-03 00:32:49 +08:00
life 46bc714b45 Merge pull request #109 from goodbest/patch-4
When admin username changes, this link is dead
2015-04-02 16:20:18 +08:00
life c390d12dd2 update controller 2015-04-02 13:58:02 +08:00
life b59eba4ca4 Merge pull request #104 from Refactoring/master
实现组内人员可分享内容至这个组
2015-04-02 09:43:12 +08:00
life 8e52074346 Merge pull request #105 from goodbest/patch-2
add missing key for notebook
2015-04-02 09:38:08 +08:00
life ade77bba58 Update app.conf 2015-03-31 18:34:45 +08:00
life 849118f9b8 update api doc 2015-03-31 18:27:53 +08:00
life f0b45deaec Merge branch 'dev' 2015-03-31 18:17:57 +08:00
life 5ebfe301f8 fix note 2015-03-31 18:16:47 +08:00
life 801263f50c Merge branch 'dev' 2015-03-31 18:13:21 +08:00
life 6bd6f70cbf merge dev-life 2015-03-31 18:08:21 +08:00
life f38a86cb07 v1.0-beta.4 fix conflict 2015-03-31 18:00:49 +08:00
life f755574576 Merge branch 'dev'
Conflicts:
	conf/app.conf
2015-03-31 17:59:16 +08:00
life d568c286d5 initial db data 2015-03-31 17:57:10 +08:00
life cbf5c7f941 initial db data 2015-03-31 17:56:58 +08:00
life ce0e099bbd fix conflicts 2015-03-31 17:52:18 +08:00
life fbf819f4d2 merge dev-life 2015-03-31 17:29:16 +08:00
life bb65ef992a Note._toHtmlEntity move to common.js 2015-03-31 17:04:22 +08:00
life ab0ee68f39 fix conflict 2015-03-31 16:56:35 +08:00
life f959694b0f fix conflict 2015-03-31 16:56:26 +08:00
life 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
life 9aacba4c31 conf 2015-03-31 14:39:03 +08:00
life e47dc0dc18 beta.4 initial data 2015-03-31 14:34:54 +08:00
life 0b3d69e73c beta.4 initial data 2015-03-31 14:34:08 +08:00
life decf580ed3 API, Tag 2015-03-31 14:27:26 +08:00
life 3b1d9e6a73 Merge pull request #95 from Deathis/dev
修复移动端用户头像不是绝对地址导致某些情况地址错误的问题
2015-03-29 00:14:18 +08:00
life 9803249ab1 Update app.conf 2015-01-13 20:04:05 +08:00
life ac99e20aa4 default theme clean & replace install data 2015-01-10 20:51:50 +08:00
life d5dabecb81 blog theme redesign 2015-01-10 19:04:46 +08:00
life df9bc37e1d blog theme redesign 2015-01-10 19:04:06 +08:00
life 4277caa571 initial data, add index to notes 2015-01-09 00:32:34 +08:00
life 1d18908cd0 add images 2015-01-09 00:23:33 +08:00
life 916ee52cdb Update conf 2015-01-09 00:13:20 +08:00
life 289e7b16d9 build 2015-01-08 23:33:14 +08:00
life 016ef5de2d delete app.conf-default, routes-default 2015-01-08 23:29:24 +08:00
life 52d0a7ed21 delete medium theme 2015-01-08 23:27:13 +08:00
life 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
life 9515f1e58f 打包发布最新功能 2015-01-08 22:08:09 +08:00
life c514d0bc1c Ace & Markdown全新编辑器 & others
邀请注册
共享后图片可见问题 fileService::getFile()
笔记历史记录问题
共享后得到被共享者列表问题 shareService
themeService 博客主题新建问题, 模板循环引用问题
markdown编辑器双屏大小不能保存问题
2015-01-08 21:15:56 +08:00
life d24531dc78 update messages 2015-01-08 00:38:54 +08:00
life 2cfc89ca5f ace editor, markdown editor 2015-01-08 00:36:28 +08:00
life be01c9c3f7 刷新共享笔记时有问题 2014-12-09 23:43:14 +08:00
life 17718732cc 国际化, #21, #26, 2014-12-09 23:17:36 +08:00
life e2e90f8618 Merge branch 'master' of github.com:leanote/leanote 2014-12-07 22:05:30 +08:00
life 25d5df6bfc update readme 2014-12-07 22:02:01 +08:00
life c49593171c note 2014-12-02 23:20:10 +08:00
life 45d72051d0 Note 2014-12-02 23:19:43 +08:00
life 10b387faa6 compatible for iphone/ipad 2014-12-02 22:56:48 +08:00
life 30ebc95abf compatible for iPhone/ipad 2014-12-02 22:47:12 +08:00
life 9bc65bc099 compatible for iPhone/ipad; writing mode for ipad/iphone 2014-12-02 22:42:46 +08:00
life 39809dc4c6 update read me 2014-11-21 09:52:37 +08:00
life 8c4a203d96 sort cate beta2 2014-11-17 14:21:25 +08:00
life 034ad821ca beta2 preNextBlog fixed 2014-11-13 16:46:22 +08:00
life c894b7b308 beta2 google code pretty js 2014-11-13 14:21:38 +08:00
life c0979be9f3 markdown table theme 2014-11-13 13:02:05 +08:00
life b45e9eacb0 beta2 preview controller 2014-11-13 12:35:48 +08:00
life 16d47418ad beta2 default theme url title 2014-11-13 10:31:11 +08:00
life 5d48d1853d use urlTitle for post url 2014-11-12 23:57:50 +08:00
life f503da30b7 member blog list avatar 2014-11-12 23:12:10 +08:00
life 11e282de9a beta.2 released 2014-11-12 21:12:02 +08:00
life 8f86754bf2 group 2014-11-12 20:39:04 +08:00
life e2f125b253 theme data 2014-11-12 20:35:30 +08:00
life 0e55b1d83d ace editor 2014-11-12 20:24:41 +08:00
life 52a3ac13b3 remove unused js 2014-11-12 20:24:24 +08:00
life 6f12e179eb leanote beta2 release 2014-11-12 20:08:07 +08:00