Commits · 37de930b9a7fcd816137944511b67a2d1fdc2730 · scrmGroup / pisns-forum-api

04 Jul, 2016 2 commits
- Merge branch 'newfunc_0510_forum_management' into SANDBOX · 37de930b
  陈家荣 authored Jul 04, 2016
  
  37de930b
- update · a7a13c85
  陈家荣 authored Jul 04, 2016
  
  a7a13c85
01 Jul, 2016 2 commits
- Merge branch 'newfunc_0510_forum_management' into SANDBOX · 0504b3ab
  陈家荣 authored Jul 01, 2016
  
  0504b3ab
- update · c362de6b
  陈家荣 authored Jul 01, 2016
  
  c362de6b
29 Jun, 2016 2 commits
- Merge branch 'bugfix_0628_thread_participant' into SANDBOX · 0440b4a7
  陈家荣 authored Jun 29, 2016
  
  0440b4a7
- update · 937eb9a3
  陈家荣 authored Jun 29, 2016
  
  937eb9a3
28 Jun, 2016 2 commits
- Merge branch 'bugfix_0628_thread_participant' into SANDBOX · 693ed0d2
  陈家荣 authored Jun 28, 2016
  
  693ed0d2
- update · d7732c18
  陈家荣 authored Jun 28, 2016
  
  d7732c18
27 Jun, 2016 2 commits
- Merge branch 'remould_0627_forum_management' into SANDBOX · 12f529a9
  陈家荣 authored Jun 27, 2016
  
  12f529a9
- 删除板块时API检查是否有有效的帖子 · f28fcb7b
  陈家荣 authored Jun 27, 2016
  
  f28fcb7b
24 Jun, 2016 1 commit
- Merge commit '32dbf692 ' · e93dc73f
  strong authored Jun 24, 2016
  
  e93dc73f
21 Jun, 2016 5 commits
- Merge commit '528f8843 ' · c02906a1
  strong authored Jun 21, 2016
  
  c02906a1
- 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 1 commit
- 帖子，评论批量异步删除和屏蔽 · ae9968b0
  刘文胜 authored Jun 01, 2016
  
  ae9968b0