Commits · 209ade6395f30dcee9e8a5baf319372e65356822 · scrmGroup / pisns-forum-api · GitLab

21 Jun, 2016 4 commits
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · 209ade63
  陈家荣 authored Jun 21, 2016
  
  209ade63
- update · 32dbf692
  陈家荣 authored Jun 21, 2016
  
  32dbf692
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · e81cb907
  刘文胜 authored Jun 21, 2016
  
  e81cb907
- task undefined · 1e04fef4
  刘文胜 authored Jun 21, 2016
  
  1e04fef4
20 Jun, 2016 17 commits
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · 0ddba2d1
  陈家荣 authored Jun 20, 2016
  
  0ddba2d1
- update · b4e44995
  陈家荣 authored Jun 20, 2016
  
  b4e44995
- update · c8097e23
  陈家荣 authored Jun 20, 2016
  
  c8097e23
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · d54ba27a
  陈家荣 authored Jun 20, 2016
  
  d54ba27a
- update · b3f19b3d
  陈家荣 authored Jun 20, 2016
  
  b3f19b3d
- Merge branch 'bugfix_0620_aboutme_list' into SANDBOX · 166fecc4
  陈家荣 authored Jun 20, 2016
  
  166fecc4
- update · 528f8843
  陈家荣 authored Jun 20, 2016
  
  528f8843
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · 2c276e48
  陈家荣 authored Jun 20, 2016
  
  2c276e48
- update · f1f7f1bd
  陈家荣 authored Jun 20, 2016
  
  f1f7f1bd
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · d28dc44b
  陈家荣 authored Jun 20, 2016
  
  d28dc44b
- update · 60b3e06f
  陈家荣 authored Jun 20, 2016
  
  60b3e06f
- Merge branch 'newfunc_0620_comment_list' into SANDBOX · f24ec691
  陈家荣 authored Jun 20, 2016
```
Conflicts:
	app/service/forumCommentService.js
```
  f24ec691
- update 评论 · 2dc3591a
  陈家荣 authored Jun 20, 2016
  
  2dc3591a
- Merge branch 'bugfix_0620_aboutme_list' into SANDBOX · ac71f1ef
  陈家荣 authored Jun 20, 2016
  
  ac71f1ef
- 查询aboutme列表时，api不过滤结果集的已被删除的评论 · 76237d03
  陈家荣 authored Jun 20, 2016
  
  76237d03
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · a289864b
  刘文胜 authored Jun 20, 2016
  
  a289864b
- 帖子评论接口过滤掉status=2的数据并且可以指定降序还是升序 · 7f823748
  刘文胜 authored Jun 20, 2016
  
  7f823748
16 Jun, 2016 4 commits
- Merge remote-tracking branch 'remotes/origin/remould_0614_thumbup' into SANDBOX · b4769a4a
  刘文胜 authored Jun 16, 2016
  
  b4769a4a
- histhreads 接口增加获取是否点赞 · 5eaf6846
  刘文胜 authored Jun 16, 2016
  
  5eaf6846
- Merge remote-tracking branch 'remotes/origin/remould_0614_thumbup' into SANDBOX · cd4e4ee8
  刘文胜 authored Jun 16, 2016
  
  cd4e4ee8
- 当aboutme type =帖子的时候需要加载是否点赞 · 88af34a5
  刘文胜 authored Jun 16, 2016
  
  88af34a5
02 Jun, 2016 2 commits
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · c3e2fba3
  刘文胜 authored Jun 02, 2016
  
  c3e2fba3
- 异步批量帖子评论删除屏蔽 · 572274a5
  刘文胜 authored Jun 02, 2016
  
  572274a5
01 Jun, 2016 5 commits
- 帖子，评论批量异步删除和屏蔽 · ae9968b0
  刘文胜 authored Jun 01, 2016
  
  ae9968b0
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · 5b8cebf5
  刘文胜 authored Jun 01, 2016
  
  5b8cebf5
- sandbox 内网mongodb · d95750c8
  刘文胜 authored Jun 01, 2016
  
  d95750c8
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · c98f5298
  刘文胜 authored Jun 01, 2016
  
  c98f5298
- 搜索帖子评论增加按指定字段排序 · 7ca535bb
  刘文胜 authored Jun 01, 2016
  
  7ca535bb
31 May, 2016 4 commits
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · bdba6521
  刘文胜 authored May 31, 2016
  
  bdba6521
- 批量删除屏蔽评论，查询结果 · b088abfe
  刘文胜 authored May 31, 2016
  
  b088abfe
- Merge remote-tracking branch 'remotes/origin/newfunc_0510_forum_management' into SANDBOX · 2513893c
  刘文胜 authored May 31, 2016
```
Conflicts:
	app/service/forumThreadService.js
```
  2513893c
- 升级lodash到3.10 帖子管理接口新增批量屏蔽,删除帖子(查询结果), 帖子评论批量屏蔽，删除(查询结果) · 7c887285
  刘文胜 authored May 31, 2016
  
  7c887285
27 May, 2016 1 commit
- Merge branch 'bugfix_0523_spread_report' · 2735b943
  strong authored May 27, 2016
  
  2735b943
26 May, 2016 3 commits
- Merge remote-tracking branch 'remotes/origin/bugfix_0523_spread_report' into SANDBOX · ef57f8dd
  刘文胜 authored May 26, 2016
  
  ef57f8dd
- 传播图优化 · b4f23c79
  刘文胜 authored May 26, 2016
  
  b4f23c79
- Merge remote-tracking branch 'remotes/origin/bugfix_0523_spread_report' into SANDBOX · f33f0e7d
  刘文胜 authored May 26, 2016
  
  f33f0e7d