Commits · 2678facf6e06f34e994d99dcecb549da1ff0e232 · scrmGroup / pisns-forum-api

08 Dec, 2015 4 commits
- Merge branch 'remould_1120_spreadchain' into SANDBOX · 2678facf
  strong authored Dec 08, 2015
  
  2678facf
- 1.传播链图使用redis优化数据获取 · 52fe4c82
  car authored Dec 08, 2015
```
2.调整传播链图的颜色样式
```
  52fe4c82
- 1.传播链图使用redis优化数据获取 · ae73d4ae
  car authored Dec 08, 2015
```
2.调整传播链图的颜色样式
```
  ae73d4ae
- 修改后台文章排序 · 5b13b98c
  陈家荣 authored Dec 08, 2015
  
  5b13b98c
07 Dec, 2015 1 commit
- Merge branch 'remould_1120_spreadchain' · e0b6068c
  strong authored Dec 07, 2015
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
```
  e0b6068c
03 Dec, 2015 1 commit
- gephi方式生成传播链图表 · e323e698
  car authored Dec 03, 2015
  
  e323e698
02 Dec, 2015 4 commits
- Merge branch 'newfunc_1120_thread_quality' · 0c1302b5
  strong authored Dec 02, 2015
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
```
  0c1302b5
- Merge branch 'remould_1123_share' · 43a2e2b3
  strong authored Dec 02, 2015
  
  43a2e2b3
- Merge branch 'master' into SANDBOX · 4d0265c7
  strong authored Dec 02, 2015
  
  4d0265c7
- 修复社区文章报表行为数据查不出来的问题（mr参数的日期格式有问题） · 8d1972c5
  strong authored Dec 02, 2015
  
  8d1972c5
30 Nov, 2015 8 commits
- Merge commit '7e6754c1 ' into SANDBOX · 33b7c58c
  strong authored Nov 30, 2015
  
  33b7c58c
- 去掉测试 · 7e6754c1
  陈家荣 authored Nov 30, 2015
  
  7e6754c1
- Merge commit 'a83dfdf2 ' into SANDBOX · 8ba83c01
  strong authored Nov 30, 2015
  
  8ba83c01
- 测试分享表情 · a83dfdf2
  陈家荣 authored Nov 30, 2015
  
  a83dfdf2
- Merge branch 'remould_1123_share' into SANDBOX · cd1a7529
  strong authored Nov 30, 2015
  
  cd1a7529
- 测试一下不过滤表情 · 94501c12
  陈家荣 authored Nov 30, 2015
  
  94501c12
- Merge commit '0852c32b ' into SANDBOX · 497f12fa
  strong authored Nov 30, 2015
  
  497f12fa
- 帖子发布前校验用户输入内容是否全部为表情 · 0852c32b
  陈家荣 authored Nov 30, 2015
  
  0852c32b
27 Nov, 2015 8 commits
- Merge branch 'remould_1123_share' into SANDBOX · d8082457
  strong authored Nov 27, 2015
  
  d8082457
- 22 · 4a880a22
  陈家荣 authored Nov 27, 2015
  
  4a880a22
- Merge branch 'remould_1123_share' into SANDBOX · cbb5f533
  strong authored Nov 27, 2015
  
  cbb5f533
- 修改分享 · 304843a4
  陈家荣 authored Nov 27, 2015
  
  304843a4
- Merge branch 'remould_1123_share' into SANDBOX · 6e507747
  strong authored Nov 27, 2015
  
  6e507747
- 更新分享 · eed8cd96
  陈家荣 authored Nov 27, 2015
  
  eed8cd96
- Merge commit '89770488' into SANDBOX · 9f3a0a17
  strong authored Nov 27, 2015
```
# Conflicts:
#	app/controllers/mobile/forumThread.js
```
  9f3a0a17
- 帖子质量默认值改成高 · 89770488
  陈家荣 authored Nov 27, 2015
  
  89770488
25 Nov, 2015 6 commits
- Merge branch 'bugfix_1125_praise_duplicate' into SANDBOX · 0d847060
  strong authored Nov 25, 2015
  
  0d847060
- 更新文章点赞和评论点赞BUG · eb2f3a3d
  陈家荣 authored Nov 25, 2015
  
  eb2f3a3d
- update 点赞BUG · 8e11ac3b
  陈家荣 authored Nov 25, 2015
  
  8e11ac3b
- 修改点赞和取消点赞 · eb7e5212
  陈家荣 authored Nov 25, 2015
  
  eb7e5212
- Merge commit '33171aee ' into SANDBOX · a4000f20
  strong authored Nov 25, 2015
  
  a4000f20
- 更新后台不按质量排序 · 33171aee
  陈家荣 authored Nov 25, 2015
  
  33171aee
24 Nov, 2015 4 commits
- Merge branch 'newfunc_1120_thread_quality' into SANDBOX · 0581cf72
  strong authored Nov 24, 2015
  
  0581cf72
- Merge branch 'remould_1123_share' into newfunc_1120_thread_quality · 9c23ae91
  strong authored Nov 24, 2015
  
  9c23ae91
- Merge commit '6a8b5a85 ' into SANDBOX · 0d0d6643
  strong authored Nov 24, 2015
  
  0d0d6643
- 更新帖子质量 · 6a8b5a85
  陈家荣 authored Nov 24, 2015
  
  6a8b5a85
23 Nov, 2015 4 commits
- 更新文章分享图片 · 318f0be8
  陈家荣 authored Nov 23, 2015
  
  318f0be8
- Merge branch 'remould_1123_share' into SANDBOX · 6e3b99f4
  strong authored Nov 23, 2015
  
  6e3b99f4
- 更新文章分享标题 · 3e2a676a
  陈家荣 authored Nov 23, 2015
  
  3e2a676a
- 更改文章分享标题和图片 · 276fc659
  陈家荣 authored Nov 23, 2015
  
  276fc659