Commits · d046aa8ed04dc5afc9d160370d49e46f4efe3439 · scrmGroup / pisns-forum-api

26 Jan, 2016 1 commit
- 社区分享 · d046aa8e
  刘文胜 authored Jan 26, 2016
  
  d046aa8e
25 Jan, 2016 2 commits
- 板块增加背景图 · ab6de49e
  刘文胜 authored Jan 25, 2016
  
  ab6de49e
- 修改获取荣誉头衔接口，增加设置荣誉头衔接口 · bfc664b6
  陈家荣 authored Jan 25, 2016
  
  bfc664b6
21 Jan, 2016 1 commit
- 增加头衔列表查询接口（红人馆）：头衔信息、前4头衔人员信息接口 · afe04c03
  陈家荣 authored Jan 21, 2016
  
  afe04c03
20 Jan, 2016 6 commits
- Merge branch 'bugfix_0118_info_delete' into SANDBOX · d20ad695
  strong authored Jan 20, 2016
  
  d20ad695
- 11111111 · 0e781225
  刘文胜 authored Jan 20, 2016
  
  0e781225
- Merge branch 'bugfix_0118_info_delete' into SANDBOX · c0645f67
  strong authored Jan 20, 2016
  
  c0645f67
- 修改文件编码为utf-8 · 8ad7baff
  刘文胜 authored Jan 20, 2016
  
  8ad7baff
- 11111 · 697aacc1
  刘文胜 authored Jan 20, 2016
  
  697aacc1
- 解决评论楼层重复的问题 · 732cf93b
  刘文胜 authored Jan 20, 2016
  
  732cf93b
19 Jan, 2016 4 commits
- Merge commit 'dbc9c669 ' into SANDBOX · 2fae26c3
  strong authored Jan 19, 2016
  
  2fae26c3
- 后台帖子加精 · dbc9c669
  刘文胜 authored Jan 19, 2016
  
  dbc9c669
- Merge branch 'bugfix_0118_info_delete' into SANDBOX · 1bac68f0
  strong authored Jan 19, 2016
  
  1bac68f0
- 1111 · 6a9dc616
  刘文胜 authored Jan 19, 2016
  
  6a9dc616
18 Jan, 2016 4 commits
- Merge branch 'bugfix_0118_info_delete' into SANDBOX · b027c442
  strong authored Jan 18, 2016
  
  b027c442
- 1111 · 1109f3bf
  刘文胜 authored Jan 18, 2016
  
  1109f3bf
- Merge branch 'master' into SANDBOX · 95f41ba3
  strong authored Jan 18, 2016
  
  95f41ba3
- 解决帖子列表搜索有板块也显示板块已删除 · ec7b4d1e
  刘文胜 authored Jan 18, 2016
  
  ec7b4d1e
13 Jan, 2016 1 commit
- 取消标签置顶时将time设置为null · 3cddaf18
  strong authored Jan 13, 2016
  
  3cddaf18
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 2 commits
- update 2 · b4b4f579
  陈家荣 authored Dec 28, 2015
  
  b4b4f579
- 帖子管理增加设置成活动功能 · 6a5d6237
  陈家荣 authored Dec 28, 2015
  
  6a5d6237