Commits · 4e5f38f87381b4108c3a4db141ae7a4630fbe26f · scrmGroup / pisns-forum-api

27 Apr, 2016 1 commit
- Merge branch 'bugfix_0329_sort' · 4e5f38f8
  strong authored Apr 27, 2016
  
  4e5f38f8
26 Apr, 2016 1 commit
- 修改排序条件 · 474b6f0f
  陈家荣 authored Apr 26, 2016
  
  474b6f0f
25 Apr, 2016 2 commits
- 修改排序 · 44a7ab05
  陈家荣 authored Apr 25, 2016
  
  44a7ab05
- 修改版块首页最热排序 · affa3da9
  陈家荣 authored Apr 25, 2016
  
  affa3da9
15 Apr, 2016 1 commit
- Merge branch 'newfunc_0321_personal_site' · ce39b4d9
  strong authored Apr 15, 2016
  
  ce39b4d9
14 Apr, 2016 3 commits
- 更新社区帖子查询 · 6867bbc2
  陈家荣 authored Apr 14, 2016
  
  6867bbc2
- 更新文章屏蔽状态，3改成0 · bd7ea502
  陈家荣 authored Apr 14, 2016
  
  bd7ea502
- 后台话题管理增加子话题数量显示 · 182dcc8d
  陈家荣 authored Apr 14, 2016
  
  182dcc8d
12 Apr, 2016 1 commit
- 系统消息接口获取用户头像返回 · d3891854
  陈家荣 authored Apr 12, 2016
  
  d3891854
08 Apr, 2016 1 commit
- Merge branch 'newfunc_0321_personal_site' · fb5f5398
  strong authored Apr 08, 2016
  
  fb5f5398
06 Apr, 2016 1 commit
- 收藏帖子排序 · c1ec3b80
  陈家荣 authored Apr 06, 2016
  
  c1ec3b80
01 Apr, 2016 9 commits
- update · 2f7c9a22
  陈家荣 authored Apr 01, 2016
  
  2f7c9a22
- update · 23a191fc
  陈家荣 authored Apr 01, 2016
  
  23a191fc
- Merge commit 'f323231d ' · f38031f8
  strong authored Apr 01, 2016
  
  f38031f8
- Merge commit '48197adc ' · 831344de
  strong authored Apr 01, 2016
  
  831344de
- remove update sort · 3525c6d3
  陈家荣 authored Apr 01, 2016
  
  3525c6d3
- update sort · 95d6e921
  陈家荣 authored Apr 01, 2016
  
  95d6e921
- update sort · f323231d
  陈家荣 authored Apr 01, 2016
  
  f323231d
- update · d2362fad
  陈家荣 authored Apr 01, 2016
  
  d2362fad
- 增加板块收藏数 · 48197adc
  陈家荣 authored Apr 01, 2016
  
  48197adc
31 Mar, 2016 7 commits
- Merge branch 'bugfix_0329_sort' · 6c89332d
  strong authored Mar 31, 2016
  
  6c89332d
- Merge branch 'remould_0330_dashboard_optimize' · b6fa69ad
  strong authored Mar 31, 2016
  
  b6fa69ad
- Merge branch 'newfunc_0321_personal_site' · 828e6ba1
  strong authored Mar 31, 2016
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
#	app/models/forumThread.js
```
  828e6ba1
- Merge branch 'bugfix_0328_plate_report' · b752dd3c
  strong authored Mar 31, 2016
  
  b752dd3c
- Merge branch 'remould_0324_forum_optimize' · 6dd31708
  strong authored Mar 31, 2016
  
  6dd31708
- Merge branch 'newfunc_0321_game_postthread' · 3f9ab7b6
  strong authored Mar 31, 2016
  
  3f9ab7b6
- update sort · 60c8e79c
  陈家荣 authored Mar 31, 2016
  
  60c8e79c
30 Mar, 2016 9 commits
- Merge commit 'e3d71624 ' into remould_0330_dashboard_optimize · 342ab175
  strong authored Mar 30, 2016
  
  342ab175
- Merge branch 'remould_0330_dashboard_optimize' of... · 582827f4
  strong authored Mar 30, 2016
```
Merge branch 'remould_0330_dashboard_optimize' of https://git.wxpai.cn/scrmgroup/pisns-forum-api into remould_0330_dashboard_optimize
```
  582827f4
- Merge commit 'a8118d00 ' into remould_0330_dashboard_optimize · c6b7a6fa
  strong authored Mar 30, 2016
  
  c6b7a6fa
- update · e3d71624
  陈家荣 authored Mar 30, 2016
  
  e3d71624
- 社区统计接口调整 · 1adba1ec
  刘文胜 authored Mar 30, 2016
  
  1adba1ec
- 社区统计接口 · a8118d00
  刘文胜 authored Mar 30, 2016
  
  a8118d00
- Merge commit '89aa79ec ' into SANDBOX · e14ee388
  strong authored Mar 30, 2016
  
  e14ee388
- 社区板块报表发帖数为0问题修复 · 89aa79ec
  刘文胜 authored Mar 30, 2016
  
  89aa79ec
- Merge commit '96411480 ' into SANDBOX · da8fec2b
  strong authored Mar 30, 2016
  
  da8fec2b
29 Mar, 2016 1 commit
- 更新帖子排序 · 96411480
  陈家荣 authored Mar 29, 2016
  
  96411480
25 Mar, 2016 3 commits
- Merge commit '42c90310 ' into SANDBOX · ddd069fd
  strong authored Mar 25, 2016
  
  ddd069fd
- tower task · 42c90310
  car authored Mar 25, 2016
```
帖子管理增加查询条件查询后台发的帖子
```
  42c90310
- Merge commit '57a7dcb5 ' into SANDBOX · 48049aa9
  strong authored Mar 25, 2016
  
  48049aa9