Commits · D9.160115.01 · scrmGroup / pisns-forum-api

13 Jan, 2016 1 commit
- 取消标签置顶时将time设置为null · 3cddaf18
  strong authored Jan 13, 2016
  
  3cddaf18
11 Jan, 2016 1 commit
- 前端查评论的接口的返回值恢复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 1 commit
- 修改消息 · 9616d5b7
  陈家荣 authored Jan 07, 2016
  
  9616d5b7
05 Jan, 2016 1 commit
- 修改查询消息列表接口 · b86884ff
  陈家荣 authored Jan 05, 2016
  
  b86884ff
04 Jan, 2016 1 commit
- 修改收藏记录接口 · b30b1406
  陈家荣 authored Jan 04, 2016
  
  b30b1406
31 Dec, 2015 3 commits
- 更新查询推荐帖子接口 · 240eb72e
  陈家荣 authored Dec 31, 2015
  
  240eb72e
- 更新消息 · d687e750
  陈家荣 authored Dec 31, 2015
  
  d687e750
- 增加后台发送消息给用户功能 · 0431f1b6
  陈家荣 authored Dec 31, 2015
  
  0431f1b6
29 Dec, 2015 1 commit
- 更新活动字段 · 89980f97
  陈家荣 authored Dec 29, 2015
  
  89980f97
28 Dec, 2015 3 commits
- update 2 · b4b4f579
  陈家荣 authored Dec 28, 2015
  
  b4b4f579
- 帖子管理增加设置成活动功能 · 6a5d6237
  陈家荣 authored Dec 28, 2015
  
  6a5d6237
- 更新推荐功能 · a1142f4a
  陈家荣 authored Dec 28, 2015
  
  a1142f4a
25 Dec, 2015 2 commits
- 帖子管理提供推荐功能 · cde83141
  陈家荣 authored Dec 25, 2015
  
  cde83141
- 开发前端收藏(板块,文章,用户)调用api · 4aba2f23
  陈家荣 authored Dec 25, 2015
  
  4aba2f23
17 Dec, 2015 23 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
- 1 · 529d532b
  杨翌文 authored Dec 17, 2015
  
  529d532b
- Merge branch 'remould_1214_api_optimize' into SANDBOX · 0a3cc0c2
  strong authored Dec 17, 2015
  
  0a3cc0c2
- 1 · 8336f4d0
  杨翌文 authored Dec 17, 2015
  
  8336f4d0
- Merge branch 'remould_1214_api_optimize' into SANDBOX · 4b17b950
  strong authored Dec 17, 2015
  
  4b17b950
- 1 · b5c4418a
  杨翌文 authored Dec 17, 2015
  
  b5c4418a
- 1 · e8154aea
  杨翌文 authored Dec 17, 2015
  
  e8154aea
- Merge branch 'remould_1214_api_optimize' into SANDBOX · 585ec733
  strong authored Dec 17, 2015
  
  585ec733
- Merge branch 'newfunc_1214_honorarytitle_manage' into SANDBOX · c75e8d9d
  strong authored Dec 17, 2015
  
  c75e8d9d
- fix版主加精没送积分 · a9b282c1
  陈家荣 authored Dec 17, 2015
  
  a9b282c1
- Merge commit '045d3c41' into SANDBOX · 2fa28246
  strong authored Dec 17, 2015
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
```
  2fa28246