Commit Graph
100 Commits
Author SHA1 Message Date
lealife bde2e891ef update travis 2015-09-18 11:38:55 +08:00
lealife 7acdaede0d update travis 2015-09-18 11:35:17 +08:00
lealife 45d1b4bee3 add cmd to gen routes.go, main.go 2015-09-18 11:30:38 +08:00
lealife 4d0a170f01 update travis 2015-09-18 11:23:00 +08:00
lealife 5e37e5a37d add adminUsername on app.conf 2015-09-17 18:52:10 +08:00
lealife a60da3d592 1.0 版在网页端删除笔记本出错
https://github.com/leanote/leanote/issues/207
2015-09-17 17:14:57 +08:00
lealife 9a88fab84e fix demo 2015-09-17 12:30:57 +08:00
lealife 4981d6aad4 move tests to app/tests 2015-09-16 11:14:37 +08:00
life 7193ac6833 Merge pull request #206 from duoyun/patch-1
use english  double quote
2015-09-14 21:57:36 +08:00
lealife 2b8df3ed76 update travis 2015-09-13 21:53:01 +08:00
lealife e94b004a5a update travis 2015-09-13 21:43:47 +08:00
lealife 6cc6f26fa1 travis 2015-09-13 21:40:50 +08:00
lealife 120cdd53c3 update travis 2015-09-13 21:34:30 +08:00
lealife 435aac4a9c https://github.com/leanote/leanote/issues/205 2015-09-13 21:23:58 +08:00
lealife f234cf285d update travis 2015-09-11 18:41:47 +08:00
lealife 54953b69c6 add travis status 2015-09-11 18:40:08 +08:00
lealife 60878b7a65 ad travis 2015-09-11 18:36:51 +08:00
lealife dada88d8a2 add travis 2015-09-11 18:34:38 +08:00
lealife 7167705409 add db/auth test 2015-09-11 18:31:37 +08:00
life 4217abca6e Merge pull request #203 from duoyun/master
remove unused func LoginGetUserInfo
2015-09-11 17:40:16 +08:00
lealife 4f2d7b8cd0 get mongodb configuration from env 2015-09-09 10:10:24 +08:00
lealife afbda7bfb2 reset conf 2015-09-07 22:20:53 +08:00
lealife c568756d16 使用Crypto加密, 找回密码, 修改密码修复 2015-09-07 15:39:46 +08:00
life 5794f76b0a Merge pull request #195 from duoyun/master
change md5 to bcrypt to strengthen  password hash and keep md5
2015-09-07 15:02:25 +08:00
life 74a768c0fb Merge pull request #196 from bencevans/patch-1
English Translation Updates
2015-09-07 14:58:13 +08:00
lealife 952117818c delete unused 2015-09-06 10:36:10 +08:00
lealife a31432f1bf update package.json 2015-09-05 23:56:12 +08:00
lealife b0afe25730 gulp build 2015-09-05 23:48:41 +08:00
lealife 024e0e9bae ace editor 最后没有元素, 或者元素不是p, 则在最后插入之 2015-09-05 23:46:02 +08:00
lealife dbabc3a5a8 use gulp to build leanote front-end 2015-09-05 23:42:10 +08:00
lealife a30aec8254 界面优化 2015-09-05 23:30:31 +08:00
lealife 7440218974 界面优化 2015-09-05 23:30:24 +08:00
life b3c771a87f Merge pull request #182 from ZhuangER/yu-huang
fix a nav bar's bug
2015-09-05 22:47:34 +08:00
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