Commits · e87edd9fa3ba3aac3b9b259638f3528620c206f0 · scrmGroup / pisns-forum-api

11 Jan, 2016 2 commits
- Merge branch 'bugfix_0111_comment_time' into SANDBOX · e87edd9f
  strong authored Jan 11, 2016
```
# Conflicts:
#	app/models/forumThread.js
```
  e87edd9f
- 前端查评论的接口的返回值恢复created字段 · a4ecb108
  strong authored Jan 11, 2016
  
  a4ecb108
08 Jan, 2016 3 commits
- Merge commit '9616d5b7' · c69419f0
  strong authored Jan 08, 2016
```
# Conflicts:
#	app/controllers/admin/forumThread.js
#	app/models/forumThread.js
#	app/models/forumUser.js
```
  c69419f0
- Merge commit 'b30b1406' · 8efcbaec
  strong authored Jan 08, 2016
```
# Conflicts:
#	app/models/forumThread.js
```
  8efcbaec
- Merge commit '240eb72e ' · 2741cdb0
  strong authored Jan 08, 2016
  
  2741cdb0
07 Jan, 2016 2 commits
- Merge commit '9616d5b7 ' into SANDBOX · f50f72bd
  strong authored Jan 07, 2016
  
  f50f72bd
- 修改消息 · 9616d5b7
  陈家荣 authored Jan 07, 2016
  
  9616d5b7
06 Jan, 2016 1 commit
- Merge commit 'b86884ff ' into SANDBOX · 2136667e
  strong authored Jan 06, 2016
  
  2136667e
05 Jan, 2016 1 commit
- 修改查询消息列表接口 · b86884ff
  陈家荣 authored Jan 05, 2016
  
  b86884ff
04 Jan, 2016 2 commits
- Merge commit 'b30b1406 ' into SANDBOX · c32f23c1
  strong authored Jan 04, 2016
  
  c32f23c1
- 修改收藏记录接口 · b30b1406
  陈家荣 authored Jan 04, 2016
  
  b30b1406
31 Dec, 2015 5 commits
- Merge commit '240eb72e ' into SANDBOX · b54fd02c
  strong authored Dec 31, 2015
  
  b54fd02c
- Merge commit 'd687e750' into SANDBOX · b3ee42cc
  strong authored Dec 31, 2015
```
# Conflicts:
#	app/models/forumUser.js
```
  b3ee42cc
- 更新查询推荐帖子接口 · 240eb72e
  陈家荣 authored Dec 31, 2015
  
  240eb72e
- 更新消息 · d687e750
  陈家荣 authored Dec 31, 2015
  
  d687e750
- 增加后台发送消息给用户功能 · 0431f1b6
  陈家荣 authored Dec 31, 2015
  
  0431f1b6
29 Dec, 2015 3 commits
- Merge commit '89980f97 ' into SANDBOX · 1953d4e0
  strong authored Dec 29, 2015
  
  1953d4e0
- 更新活动字段 · 89980f97
  陈家荣 authored Dec 29, 2015
  
  89980f97
- Merge commit 'b4b4f579' into SANDBOX · 6d88312a
  strong authored Dec 29, 2015
```
# Conflicts:
#	app/controllers/admin/forumThread.js
#	app/models/forumThread.js
```
  6d88312a
28 Dec, 2015 5 commits
- update 2 · b4b4f579
  陈家荣 authored Dec 28, 2015
  
  b4b4f579
- 帖子管理增加设置成活动功能 · 6a5d6237
  陈家荣 authored Dec 28, 2015
  
  6a5d6237
- Merge commit 'a1142f4a ' into SANDBOX · 07abb370
  strong authored Dec 28, 2015
  
  07abb370
- 更新推荐功能 · a1142f4a
  陈家荣 authored Dec 28, 2015
  
  a1142f4a
- Merge commit 'cde83141' into SANDBOX · a0a7e2fb
  strong authored Dec 28, 2015
```
# Conflicts:
#	app/models/forumThread.js
```
  a0a7e2fb
25 Dec, 2015 3 commits
- Merge commit '907af535 ' into SANDBOX · adc9ff4b
  strong authored Dec 25, 2015
  
  adc9ff4b
- 帖子管理提供推荐功能 · cde83141
  陈家荣 authored Dec 25, 2015
  
  cde83141
- 开发前端收藏(板块,文章,用户)调用api · 4aba2f23
  陈家荣 authored Dec 25, 2015
  
  4aba2f23
17 Dec, 2015 13 commits
- Merge commit '907af535 ' · ff853633
  strong authored Dec 17, 2015
  
  ff853633
- 333 · 907af535
  陈家荣 authored Dec 17, 2015
  
  907af535
- Merge branch 'remould_1210_icon_diff' · 1c635474
  strong authored Dec 17, 2015
  
  1c635474
- Merge branch 'remould_1210_icon_diff' into SANDBOX · f6a98233
  strong authored Dec 17, 2015
  
  f6a98233
- 更新接口 · ad91943c
  陈家荣 authored Dec 17, 2015
  
  ad91943c
- Merge commit 'f82c4e3b ' · ae5d807e
  strong authored Dec 17, 2015
  
  ae5d807e
- Merge commit '9f297526 ' · 63b57f88
  strong authored Dec 17, 2015
  
  63b57f88
- Merge commit '6c5f284d ' into SANDBOX · 4c5d9710
  strong authored Dec 17, 2015
  
  4c5d9710
- 11 · 6c5f284d
  杨翌文 authored Dec 17, 2015
  
  6c5f284d
- 1 · 4dd92d9a
  杨翌文 authored Dec 17, 2015
  
  4dd92d9a
- 1 · f2297f07
  杨翌文 authored Dec 17, 2015
  
  f2297f07
- Merge commit 'f82c4e3b ' into SANDBOX · 45f460af
  strong authored Dec 17, 2015
  
  45f460af
- 版主删除帖子功能变成屏蔽 · f82c4e3b
  chrysan authored Dec 17, 2015
  
  f82c4e3b