Commits · bbbf4b7bbcdd694d1a97f46f3a659c73b55d907c · scrmGroup / pisns-forum-api

22 Apr, 2015 23 commits
- 分享回退 · bbbf4b7b
  陈志良 authored Apr 22, 2015
  
  bbbf4b7b
- jjj · d5f3c817
  陈家荣 authored Apr 22, 2015
  
  d5f3c817
- ggg · b47a2d08
  陈家荣 authored Apr 22, 2015
  
  b47a2d08
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 1981c34d
  陈家荣 authored Apr 22, 2015
```
Conflicts:
	app/controllers/admin/forumThread.js
```
  1981c34d
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · c917666e
  陈家荣 authored Apr 22, 2015
```
Conflicts:
	app/controllers/mobile/forumThread.js
```
  c917666e
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 5e7e080d
  陈志良 authored Apr 22, 2015
  
  5e7e080d
- 3.论坛 - API - 文章排序 · e5f41a82
  陈志良 authored Apr 22, 2015
  
  e5f41a82
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 440d4a7e
  刘文胜 authored Apr 22, 2015
  
  440d4a7e
- 黑名单重复提交的检查 · db9cf846
  刘文胜 authored Apr 22, 2015
  
  db9cf846
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · 0d65869c
  陈志良 authored Apr 22, 2015
  
  0d65869c
- 论坛 - API - 文章排序 · f68e1ac7
  陈志良 authored Apr 22, 2015
  
  f68e1ac7
- 删除多余文件 · c8d5a0da
  杨翌文 authored Apr 22, 2015
  
  c8d5a0da
- 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
- SSS · b1b7e6ad
  陈家荣 authored Apr 22, 2015
  
  b1b7e6ad
- ggg · d6b25d20
  陈家荣 authored Apr 22, 2015
  
  d6b25d20
- 解决冲突 · 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 17 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