Commits · 721ae3d63613cd9e7636f4f44b90687265ed977d · scrmGroup / pisns-forum-api

17 Mar, 2016 3 commits
- 修改活动贴查询条件 · 721ae3d6
  刘文胜 authored Mar 17, 2016
  
  721ae3d6
- 1111 · c484da61
  刘文胜 authored Mar 17, 2016
  
  c484da61
- 后台帖子增加定时发送功能 · de322748
  刘文胜 authored Mar 17, 2016
  
  de322748
16 Mar, 2016 2 commits
- Merge commit '07b5828e ' into SANDBOX · fae3e0c4
  strong authored Mar 16, 2016
  
  fae3e0c4
- 查询照片墙和子话题的子文章时，过滤被评论的 · 07b5828e
  陈家荣 authored Mar 16, 2016
  
  07b5828e
15 Mar, 2016 10 commits
- Merge commit '9df1cb01 ' into SANDBOX · 67031ac4
  strong authored Mar 15, 2016
  
  67031ac4
- 111111111 · 9df1cb01
  刘文胜 authored Mar 15, 2016
  
  9df1cb01
- Merge commit 'fd48de85 ' into SANDBOX · 7d12781f
  strong authored Mar 15, 2016
  
  7d12781f
- 11111111111 · fd48de85
  刘文胜 authored Mar 15, 2016
  
  fd48de85
- 111111 · 08d8ad21
  刘文胜 authored Mar 15, 2016
  
  08d8ad21
- Merge commit '08d8ad21 ' into SANDBOX · da7e459b
  strong authored Mar 15, 2016
  
  da7e459b
- 分享日志 · 827c5e27
  刘文胜 authored Mar 15, 2016
  
  827c5e27
- Merge commit '827c5e27 ' into SANDBOX · d139fc06
  strong authored Mar 15, 2016
  
  d139fc06
- Merge commit '7c2577cf ' into SANDBOX · 150c0643
  strong authored Mar 15, 2016
  
  150c0643
- 获取最热最新照片墙时获取点赞数据 · 7c2577cf
  陈家荣 authored Mar 15, 2016
  
  7c2577cf
14 Mar, 2016 6 commits
- Merge commit '5c2a1186 ' into SANDBOX · 870a6144
  strong authored Mar 14, 2016
  
  870a6144
- Merge commit '3f7c8125 ' into SANDBOX · d15a8e42
  strong authored Mar 14, 2016
  
  d15a8e42
- 分享日志 · 5c2a1186
  刘文胜 authored Mar 14, 2016
  
  5c2a1186
- 查询帖子的状态全部改为1 · 3f7c8125
  陈家荣 authored Mar 14, 2016
  
  3f7c8125
- Merge commit 'daa1a662 ' into SANDBOX · 52ef817b
  strong authored Mar 14, 2016
  
  52ef817b
- 更新评论 · daa1a662
  陈家荣 authored Mar 14, 2016
  
  daa1a662
11 Mar, 2016 15 commits
- Merge commit '2e7f83bd ' into SANDBOX · f291758c
  strong authored Mar 11, 2016
  
  f291758c
- update · 2e7f83bd
  陈家荣 authored Mar 11, 2016
  
  2e7f83bd
- Merge commit 'e405f5d5 ' into SANDBOX · aaa1567c
  strong authored Mar 11, 2016
  
  aaa1567c
- 修改系统消息 · e405f5d5
  陈家荣 authored Mar 11, 2016
  
  e405f5d5
- 更新评论 · 7ae9df80
  陈家荣 authored Mar 11, 2016
  
  7ae9df80
- Merge commit '8f896314 ' into SANDBOX · 3c7cc69e
  strong authored Mar 11, 2016
  
  3c7cc69e
- 分享日志，声明式缓存工具类 · 8f896314
  刘文胜 authored Mar 11, 2016
  
  8f896314
- Merge commit 'b297a896 ' into SANDBOX · fcb4a018
  strong authored Mar 11, 2016
  
  fcb4a018
- 更新评论 · b297a896
  陈家荣 authored Mar 11, 2016
  
  b297a896
- Merge branch 'master' into SANDBOX · 3ed356ae
  strong authored Mar 11, 2016
  
  3ed356ae
- Merge commit 'da6694ac ' into bugfix_0311_share_log · 4589ac08
  strong authored Mar 11, 2016
  
  4589ac08
- 取消推荐后，仍在首面推荐模块显示 · da6694ac
  陈家荣 authored Mar 11, 2016
  
  da6694ac
- 回复二级评论时，出现无楼层互动评论 · e0ece109
  陈家荣 authored Mar 11, 2016
  
  e0ece109
- Merge remote-tracking branch 'origin/newfunc_0310_mobile_comments_level2' into remould_0308_forum · 9579b9cb
  陈家荣 authored Mar 11, 2016
```
Conflicts:
	app/controllers/mobile/forumThread.js
```
  9579b9cb
- 更新后台回复评论时评论数不对BUG · a32fda54
  陈家荣 authored Mar 11, 2016
  
  a32fda54
10 Mar, 2016 4 commits
- 二级评论不过滤掉又前端判断显示方式 · bdadbb88
  刘文胜 authored Mar 10, 2016
  
  bdadbb88
- Merge commit '8d924e48 ' into SANDBOX · fa46f642
  strong authored Mar 10, 2016
  
  fa46f642
- 帖子详情增加荣誉 · 8d924e48
  陈家荣 authored Mar 10, 2016
  
  8d924e48
- Merge commit 'fd749970 ' into SANDBOX · 1b50346c
  strong authored Mar 10, 2016
  
  1b50346c