 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 |
|
|
life
|
4669fbcbdd
|
leaui_image form url css
|
2014-11-12 19:43:42 +08:00 |
|
|
life
|
51fedfa6dc
|
default themes and fix notebook to blog bug
|
2014-11-12 19:36:31 +08:00 |
|
|
life
|
cd3c2f7b12
|
default /
|
2014-11-12 19:08:41 +08:00 |
|
|
life
|
a6d3fe9cb8
|
beta default routes
|
2014-11-12 19:00:09 +08:00 |
|
|
life
|
9d47b4eac9
|
beta2 default data
|
2014-11-12 18:57:43 +08:00 |
|
|
life
|
163215d547
|
beta2 theme
|
2014-11-12 18:54:42 +08:00 |
|
|
life
|
4d7a9c8089
|
Merge branch 'feature-blog-theme'
|
2014-11-12 17:38:55 +08:00 |
|
|
life
|
4e1f8f3d6e
|
beta2 small fixed
|
2014-11-12 17:37:36 +08:00 |
|
|
life
|
320c78e925
|
beta2 default data
|
2014-11-12 17:35:08 +08:00 |
|
|
life
|
6a4d7d1056
|
beta2 ok
|
2014-11-12 17:32:22 +08:00 |
|
|
life
|
1f45666ec4
|
beta2 ok
|
2014-11-12 17:32:03 +08:00 |
|
|
life
|
d979a0c3e2
|
blog, tags, archives
|
2014-11-10 23:56:15 +08:00 |
|
|
life
|
6555384e5c
|
siteurl, adminUsername config in configService
|
2014-11-10 16:26:04 +08:00 |
|
|
life
|
954c4e5e95
|
for setBlog
|
2014-11-09 22:26:38 +08:00 |
|
|
life
|
8ef91b7418
|
test
|
2014-11-09 22:14:59 +08:00 |
|
|
life
|
e5f7c66d1e
|
test
|
2014-11-09 22:14:08 +08:00 |
|
|
life
|
346abfe91d
|
upload file size limit [ok]
|
2014-11-09 18:00:23 +08:00 |
|
|
life
|
2a457d6027
|
reset password
|
2014-11-09 16:54:56 +08:00 |
|
|
life
|
274782b89e
|
member center, blog redesign
|
2014-11-09 16:24:19 +08:00 |
|
|
life
|
5f186f4455
|
theme preview
|
2014-11-05 11:33:07 +08:00 |
|
|
life
|
f20565d54b
|
just for rename
|
2014-10-28 14:48:22 +08:00 |
|
|
life
|
af9a820cbf
|
just for test
|
2014-10-28 14:47:58 +08:00 |
|
|
life
|
33e2428b64
|
views
|
2014-10-28 14:40:37 +08:00 |
|
|
life
|
35c06771e7
|
delte unsless images
|
2014-10-26 11:30:29 +08:00 |
|
|
life
|
2f81a529fc
|
useless js, css clear
|
2014-10-26 11:19:27 +08:00 |
|
|
life
|
5d559da2a6
|
Update ConfigService.go
|
2014-10-25 01:12:58 +08:00 |
|
|
life
|
fe910fd91d
|
update readme
|
2014-10-24 10:01:47 +08:00 |
|
|
life
|
1c6c645c9f
|
v1.0 readme
|
2014-10-23 11:52:51 +08:00 |
|
|
life
|
04838cc996
|
v1.0 readme
|
2014-10-23 11:49:25 +08:00 |
|
|
life
|
86ecc55f41
|
v1.0-beta release
|
2014-10-23 11:41:02 +08:00 |
|
|
life
|
e4323d0cb2
|
leanote v1.0 release
|
2014-10-23 10:52:48 +08:00 |
|
|
life
|
28fbdb9ee2
|
open register init data
|
2014-10-23 10:47:04 +08:00 |
|
|
life
|
b0b304d5dd
|
admin username & jsonp fixed
|
2014-10-23 10:45:03 +08:00 |
|
|
life
|
536c5de56a
|
v1.0 routes
|
2014-10-23 10:10:12 +08:00 |
|
|
life
|
1f51f6cc9b
|
v1.0 fixed
|
2014-10-23 10:03:19 +08:00 |
|
|
life
|
0ea4843cac
|
v1.0
|
2014-10-22 22:30:49 +08:00 |
|
|
life
|
ebcce0a247
|
v1.0
|
2014-10-22 22:24:46 +08:00 |
|
|
life
|
b43c68ec2d
|
Merge branch 'develop-v1.0'
|
2014-10-22 19:19:40 +08:00 |
|
|
life
|
762f6b554d
|
conf-default
|
2014-10-22 17:04:37 +08:00 |
|
|
life
|
593d2c2965
|
v1.0 beta init
|
2014-10-22 16:20:45 +08:00 |
|
|
life
|
8ae438272b
|
change moto and delete lea
|
2014-10-15 17:31:27 +08:00 |
|
|
life
|
f99cca40c2
|
add qq group
|
2014-10-14 22:58:24 +08:00 |
|
|
life
|
3f1930723a
|
lea pagination
|
2014-09-25 11:37:37 +08:00 |
|
|
life
|
9fbbde9849
|
lea++ style fixed
|
2014-09-24 23:13:37 +08:00 |
|
|
life
|
3bade30e1a
|
lea++
|
2014-09-24 23:01:57 +08:00 |
|
|
life
|
44c8f2a7e2
|
fix
|
2014-09-24 22:56:06 +08:00 |
|
|
life
|
8d820b069c
|
blog css fixed image width
|
2014-09-24 22:43:33 +08:00 |
|