Commits · 04ab815779862013f0736ce25ceb6a6c998d1e05 · scrmGroup / pisns-forum-api

22 Apr, 2015 1 commit
- 合并冲突 · 04ab8157
  邓军 authored Apr 22, 2015
  
  04ab8157
21 Apr, 2015 11 commits
- 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 · b1e512e2
  刘文胜 authored Apr 21, 2015
  
  b1e512e2
- 代码合并 · f2a61e4b
  邓军 authored Apr 21, 2015
  
  f2a61e4b
- 举报管理 · 707e5c69
  刘文胜 authored Apr 21, 2015
  
  707e5c69
- 子文章管理 · 7059dc89
  邓军 authored Apr 21, 2015
  
  7059dc89
- 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 13 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
- a · 91550cb9
  陈志良 authored Apr 17, 2015
  
  91550cb9
- 社区Log · 41b3eacf
  陈志良 authored Apr 17, 2015
  
  41b3eacf
- 优化LOG接口 · 98a887e2
  邓军 authored Apr 17, 2015
  
  98a887e2
- PV UV log · 8cd71c2a
  邓军 authored Apr 17, 2015
  
  8cd71c2a
- 添加log的IP 和userAgen · 5438bec5
  邓军 authored Apr 17, 2015
  
  5438bec5
- pv/uv log · e192c05c
  邓军 authored Apr 17, 2015
  
  e192c05c
- pv/uv log · e6ca87b5
  邓军 authored Apr 17, 2015
  
  e6ca87b5
- Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development · c8c21d23
  邓军 authored Apr 17, 2015
```
Conflicts:
	app/controllers/mobile/forumShare.js
```
  c8c21d23
- 微信接口修改 · 2e0696cb
  邓军 authored Apr 17, 2015
  
  2e0696cb
16 Apr, 2015 7 commits
- admin · b410dc34
  陈志良 authored Apr 16, 2015
  
  b410dc34
- bbb · 3de03c7f
  陈志良 authored Apr 16, 2015
  
  3de03c7f
- 分享带来的用户 · cd2ae824
  陈志良 authored Apr 16, 2015
  
  cd2ae824
- 分享带回用户 · c0bc8fc2
  陈志良 authored Apr 16, 2015
  
  c0bc8fc2
- 发帖与评论推送积分 · 3d6d5a60
  陈志良 authored Apr 16, 2015
  
  3d6d5a60
- 分享推送积分 · ade03469
  陈志良 authored Apr 16, 2015
  
  ade03469
- 个性化分享 · 824a0fba
  邓军 authored Apr 16, 2015
  
  824a0fba
15 Apr, 2015 1 commit
- 增加后台默认分享接口文件 · 068e2633
  邓军 authored Apr 15, 2015
  
  068e2633