Commits · fb5f53985b5ac60a853f30a2e2b8bb3bc436725f · scrmGroup / pisns-forum-api

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 11 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
- update 4 · 57a7dcb5
  陈家荣 authored Mar 25, 2016
  
  57a7dcb5
- Merge commit 'f25593b7 ' into SANDBOX · 06a14c54
  strong authored Mar 25, 2016
  
  06a14c54
- update 3 · f25593b7
  陈家荣 authored Mar 25, 2016
  
  f25593b7
- update · 618d1615
  陈家荣 authored Mar 25, 2016
  
  618d1615
- Merge commit '4be09bba' into SANDBOX · d1a4ff35
  strong authored Mar 25, 2016
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
#	app/models/forumThread.js
```
  d1a4ff35
- tower task · 28664014
  car authored Mar 25, 2016
```
帖子管理增加查询条件查询后台发的帖子
```
  28664014
- update · 4be09bba
  陈家荣 authored Mar 25, 2016
  
  4be09bba
- 用户收藏和个人小站接口 · 33d3f3ba
  陈家荣 authored Mar 25, 2016
  
  33d3f3ba
23 Mar, 2016 1 commit
- Merge branch 'remould_0308_forum' · 46020da7
  strong authored Mar 23, 2016
  
  46020da7