Commits · 623c76c5ed5b5da6c77345ed01d0fff00b28db3c · scrmGroup / pisns-forum-api

27 Jan, 2016 5 commits
- 公告分享 · 623c76c5
  刘文胜 authored Jan 27, 2016
  
  623c76c5
- Merge branch 'remould_0120_page_style' of... · f9fab099
  刘文胜 authored Jan 27, 2016
```
Merge branch 'remould_0120_page_style' of git.wxpai.cn:scrmgroup/pisns-forum-api into remould_0120_page_style
```
  f9fab099
- 公告分享 · c02326f9
  刘文胜 authored Jan 27, 2016
  
  c02326f9
- update · 26fb8d99
  陈家荣 authored Jan 27, 2016
  
  26fb8d99
- update 荣誉头衔列表增加排序 · f285872a
  陈家荣 authored Jan 27, 2016
  
  f285872a
26 Jan, 2016 5 commits
- update · 363442eb
  陈家荣 authored Jan 26, 2016
  
  363442eb
- 推荐列表增加缓存 · 7666958f
  陈家荣 authored Jan 26, 2016
  
  7666958f
- 1111 · 7596abfc
  刘文胜 authored Jan 26, 2016
  
  7596abfc
- Merge branch 'remould_0120_page_style' of... · 0bb11017
  刘文胜 authored Jan 26, 2016
```
Merge branch 'remould_0120_page_style' of git.wxpai.cn:scrmgroup/pisns-forum-api into remould_0120_page_style
```
  0bb11017
- 社区分享 · d046aa8e
  刘文胜 authored Jan 26, 2016
  
  d046aa8e
25 Jan, 2016 10 commits
- update 帖子列表 · 5be86ac8
  陈家荣 authored Jan 25, 2016
  
  5be86ac8
- update 帖子列表 · 25842cd7
  陈家荣 authored Jan 25, 2016
  
  25842cd7
- update · 98954bbd
  陈家荣 authored Jan 25, 2016
  
  98954bbd
- 增加获取板块列表接口 · fb699211
  陈家荣 authored Jan 25, 2016
  
  fb699211
- update · a13a1377
  陈家荣 authored Jan 25, 2016
  
  a13a1377
- 修改获取帖子列表 · 2a9a5b2d
  陈家荣 authored Jan 25, 2016
  
  2a9a5b2d
- 修改获取帖子接口，增加活动状态返回 · 1d7327e0
  陈家荣 authored Jan 25, 2016
  
  1d7327e0
- 增加获取最新帖子接口，/thread/getThreadWithNotPopulateComment · a6375040
  陈家荣 authored Jan 25, 2016
  
  a6375040
- 板块增加背景图 · 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 2 commits

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