Commits · b22f5699da49d2ef087b98aeb84df9e568d2a5c6 · scrmGroup / pisns-forum-api

22 Apr, 2015 9 commits
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · b22f5699
  邓军 authored Apr 22, 2015
  
  b22f5699
- 标签置顶 · 9567247d
  邓军 authored Apr 22, 2015
  
  9567247d
- 黑名单修改 · fb91234d
  刘文胜 authored Apr 22, 2015
  
  fb91234d
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · b36eb6d4
  刘文胜 authored Apr 22, 2015
  
  b36eb6d4
- 黑名单 · b010731c
  刘文胜 authored Apr 22, 2015
  
  b010731c
- 解决冲突 · 21a75806
  邓军 authored Apr 22, 2015
  
  21a75806
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 21b08a66
  邓军 authored Apr 22, 2015
  
  21b08a66
- csdc · 021f8437
  邓军 authored Apr 22, 2015
  
  021f8437
- 合并冲突 · 04ab8157
  邓军 authored Apr 22, 2015
  
  04ab8157
21 Apr, 2015 20 commits
- 修改了更新评论 · ea7c891e
  陈家荣 authored Apr 21, 2015
  
  ea7c891e
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · ecd5e81b
  陈家荣 authored Apr 21, 2015
  
  ecd5e81b
- 修改了更新评论 · 96342fc0
  陈家荣 authored Apr 21, 2015
  
  96342fc0
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 39674ef7
  邓军 authored Apr 21, 2015
```
Conflicts:
	app/service/forumThreadService.js
```
  39674ef7
- 1.论坛子文章管理 · 5934f4f9
  邓军 authored Apr 21, 2015
```
2.调整个性化分享BUG
```
  5934f4f9
- 修改文章状态加入判断shader是否为空 · e42b46ae
  刘文胜 authored Apr 21, 2015
  
  e42b46ae
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 713b0e6f
  陈家荣 authored Apr 21, 2015
  
  713b0e6f
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 0189d7b3
  陈家荣 authored Apr 21, 2015
```
Conflicts:
	app/controllers/admin/forumThread.js
	app/controllers/mobile/forumThread.js
```
  0189d7b3
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · b1e512e2
  刘文胜 authored Apr 21, 2015
  
  b1e512e2
- 代码合并 · f2a61e4b
  邓军 authored Apr 21, 2015
  
  f2a61e4b
- 举报管理 · 707e5c69
  刘文胜 authored Apr 21, 2015
  
  707e5c69
- 添加、更新评论 · 1bc91e62
  陈家荣 authored Apr 21, 2015
  
  1bc91e62
- 11 · b33fa754
  陈家荣 authored Apr 21, 2015
  
  b33fa754
- 子文章管理 · 7059dc89
  邓军 authored Apr 21, 2015
  
  7059dc89
- gggg · 5405131b
  陈家荣 authored Apr 21, 2015
  
  5405131b
- 添加了评论 · f5588b97
  陈家荣 authored Apr 21, 2015
  
  f5588b97
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 114142af
  邓军 authored Apr 21, 2015
  
  114142af
- qq · e76aa5ae
  邓军 authored Apr 21, 2015
  
  e76aa5ae
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 097778b9
  陈志良 authored Apr 21, 2015
  
  097778b9
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 4b434c33
  邓军 authored Apr 21, 2015
  
  4b434c33
20 Apr, 2015 7 commits
- 添加论坛帖子按发贴人app分页查询和评论分页查询接口 · 84c25b67
  邓军 authored Apr 20, 2015
  
  84c25b67
- 黑名单 · 9e39925a
  刘文胜 authored Apr 20, 2015
  
  9e39925a
- 首页 - 社区信息 · 6c823d77
  陈志良 authored Apr 20, 2015
  
  6c823d77
- log · 92ddf72f
  陈志良 authored Apr 20, 2015
  
  92ddf72f
- log · 3e35da1e
  陈志良 authored Apr 20, 2015
  
  3e35da1e
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 0ed28b1f
  刘文胜 authored Apr 20, 2015
  
  0ed28b1f
- 黑名单 · 3d210033
  刘文胜 authored Apr 20, 2015
  
  3d210033
17 Apr, 2015 4 commits
- 1 · 235aa871
  陈志良 authored Apr 17, 2015
  
  235aa871
- a · c7ca91ec
  陈志良 authored Apr 17, 2015
  
  c7ca91ec
- a · 42f330db
  陈志良 authored Apr 17, 2015
  
  42f330db
- a · 5e619745
  陈志良 authored Apr 17, 2015
  
  5e619745