Commits · 4c0b83be92bbc80c36b3e0184a054ad9aead12fb · scrmGroup / pisns-forum-api

02 Sep, 2015 1 commit
- Merge branch 'Gabriel_0831' into SANDBOX · 4c0b83be
  陈志良 authored Sep 02, 2015
  
  4c0b83be
01 Sep, 2015 4 commits
- 1 · 812064ca
  陈志良 authored Sep 01, 2015
  
  812064ca
- add console · 152051cb
  陈家荣 authored Sep 01, 2015
  
  152051cb
- 修改行为限制 · be6abd19
  陈家荣 authored Sep 01, 2015
  
  be6abd19
- Merge branch 'behavior_limition_remould' into merge_behavior_limitaion · 7921d8b0
  strong authored Sep 01, 2015
```
Conflicts:
	app/controllers/mobile/forumThread.js
```
  7921d8b0
31 Aug, 2015 9 commits
- 1 · c0b48d7c
  陈志良 authored Aug 31, 2015
  
  c0b48d7c
- Merge branch 'Gabriel_0831' into SANDBOX · 103edb87
  陈志良 authored Aug 31, 2015
  
  103edb87
- 1 · 2bfa7e12
  陈志良 authored Aug 31, 2015
  
  2bfa7e12
- 按创建时间倒序查询文章 · 88f4822b
  陈志良 authored Aug 31, 2015
  
  88f4822b
- Merge branch 'Gabriel_0831' into SANDBOX · 5f6d3c8e
  陈志良 authored Aug 31, 2015
```
Conflicts:
	app/service/forumThreadService.js
```
  5f6d3c8e
- 图片墙发帖 - 合并帖子 · 13e85e0e
  陈志良 authored Aug 31, 2015
  
  13e85e0e
- Merge commit 'f6e4ca0a ' into SANDBOX · 55018dfb
  strong authored Aug 31, 2015
  
  55018dfb
- 测试 · f6e4ca0a
  刘文胜 authored Aug 31, 2015
  
  f6e4ca0a
- Merge branch 'Notice' into SANDBOX · cb5e4b88
  strong authored Aug 31, 2015
  
  cb5e4b88
30 Aug, 2015 1 commit
- 修改帖子列表页的评论数为3 · ced9f2d9
  杨翌文 authored Aug 30, 2015
  
  ced9f2d9
29 Aug, 2015 8 commits
- Merge branch 'Notice' into SANDBOX · d13937bc
  陈志良 authored Aug 29, 2015
  
  d13937bc
- 1 · f8dc1f5a
  陈志良 authored Aug 29, 2015
  
  f8dc1f5a
- 1 · 3f75f9bc
  陈志良 authored Aug 29, 2015
  
  3f75f9bc
- Merge branch 'Notice' into SANDBOX · 5b837d1e
  陈志良 authored Aug 29, 2015
  
  5b837d1e
- 1 · 73132f66
  陈志良 authored Aug 29, 2015
  
  73132f66
- Merge commit '104f8d2e ' into SANDBOX · deda3c1d
  陈志良 authored Aug 29, 2015
  
  deda3c1d
- share · 5b022b8a
  陈志良 authored Aug 29, 2015
  
  5b022b8a
- 1 · 104f8d2e
  陈志良 authored Aug 29, 2015
  
  104f8d2e
28 Aug, 2015 8 commits
- Merge branch 'Notice' into SANDBOX · 02b9cdd4
  陈志良 authored Aug 28, 2015
  
  02b9cdd4
- Merge branch 'Notice' of git.wxpai.cn:scrmgroup/pisns-forum-api into Notice · 5cd8c8ae
  陈志良 authored Aug 28, 2015
```
Conflicts:
	app/controllers/mobile/forumThread.js
```
  5cd8c8ae
- 新版 - 评论返回完整评论 · 3926e6a1
  陈志良 authored Aug 28, 2015
  
  3926e6a1
- 22 · 53abfb9c
  陈家荣 authored Aug 28, 2015
  
  53abfb9c
- 社区行为限制改造 · 3b72a460
  陈家荣 authored Aug 28, 2015
  
  3b72a460
- 111 · 472a46e9
  刘文胜 authored Aug 28, 2015
  
  472a46e9
- 1111 · d21d7ee8
  刘文胜 authored Aug 28, 2015
  
  d21d7ee8
- 1111 · 40f56068
  刘文胜 authored Aug 28, 2015
  
  40f56068
27 Aug, 2015 9 commits
- 1 · 3792d9cc
  陈志良 authored Aug 27, 2015
  
  3792d9cc
- Merge branch 'Notice' into SANDBOX · 8a91a7be
  陈志良 authored Aug 27, 2015
  
  8a91a7be
- 1 · 39c167aa
  陈志良 authored Aug 27, 2015
  
  39c167aa
- Merge branch 'Notice' into SANDBOX · 7da29c3f
  陈志良 authored Aug 27, 2015
  
  7da29c3f
- 1 · bc504856
  陈志良 authored Aug 27, 2015
  
  bc504856
- Merge branch 'Notice' into SANDBOX · 1c861cee
  陈志良 authored Aug 27, 2015
  
  1c861cee
- 1 · f4858ecf
  陈志良 authored Aug 27, 2015
  
  f4858ecf
- Merge branch 'Notice' into SANDBOX · 07752148
  陈志良 authored Aug 27, 2015
  
  07752148
- 1 · 16d2dc7c
  陈志良 authored Aug 27, 2015
  
  16d2dc7c