Commits · 16aab39ebd485ebce545d739f65064a8190fe0b1 · scrmGroup / pisns-forum-api

10 Sep, 2015 4 commits
- Merge branch 'Gabriel_0910_updateUserIcon' · 16aab39e
  陈志良 authored Sep 10, 2015
  
  16aab39e
- 用户头像添加域名(组装成全路径) · bfd1efbd
  陈志良 authored Sep 10, 2015
  
  bfd1efbd
- 更新用户 · e6a484ea
  陈志良 authored Sep 10, 2015
  
  e6a484ea
- 发帖时更新后台用户头像与昵称 · 5347cae9
  陈志良 authored Sep 10, 2015
  
  5347cae9
08 Sep, 2015 4 commits
- Merge branch 'SANDBOX' · f04e2a0b
  陈志良 authored Sep 08, 2015
  
  f04e2a0b
- 去除打印 · ea22a43b
  陈志良 authored Sep 08, 2015
  
  ea22a43b
- Merge branch 'SANDBOX' · d6c5f2cb
  陈志良 authored Sep 08, 2015
  
  d6c5f2cb
- 我的帖子创建时间倒序 · 37a1a073
  陈志良 authored Sep 08, 2015
  
  37a1a073
06 Sep, 2015 10 commits
- Merge branch 'mycomment_remould' · 34a8c73f
  strong authored Sep 06, 2015
  
  34a8c73f
- 111 · e03e5cbd
  刘文胜 authored Sep 06, 2015
  
  e03e5cbd
- 2222 · 9404432e
  刘文胜 authored Sep 06, 2015
  
  9404432e
- 1111 · a429ea4c
  刘文胜 authored Sep 06, 2015
  
  a429ea4c
- 111 · 6f89afe2
  刘文胜 authored Sep 06, 2015
  
  6f89afe2
- 1111 · b2f5562d
  刘文胜 authored Sep 06, 2015
  
  b2f5562d
- 1111 · 14015011
  刘文胜 authored Sep 06, 2015
  
  14015011
- 1111 · 66cbb3b7
  刘文胜 authored Sep 06, 2015
  
  66cbb3b7
- 测试 · 4a880c26
  刘文胜 authored Sep 06, 2015
  
  4a880c26
- 我的评论 · 5e10bd4a
  刘文胜 authored Sep 06, 2015
  
  5e10bd4a
02 Sep, 2015 3 commits
- Merge commit '812064ca ' · a5496225
  strong authored Sep 02, 2015
  
  a5496225
- Merge branch 'merge_behavior_limitaion' into SANDBOX · 99db01d9
  strong authored Sep 02, 2015
  
  99db01d9
- Merge branch 'Gabriel_0831' into SANDBOX · 4c0b83be
  陈志良 authored Sep 02, 2015
  
  4c0b83be
01 Sep, 2015 5 commits
- 1 · 812064ca
  陈志良 authored Sep 01, 2015
  
  812064ca
- remove console · 15cb220f
  陈家荣 authored Sep 01, 2015
  
  15cb220f
- 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 14 commits
- Merge branch 'Gabriel_0831' · ad755985
  陈志良 authored Aug 31, 2015
  
  ad755985
- 1 · c0b48d7c
  陈志良 authored Aug 31, 2015
  
  c0b48d7c
- 1 · 498c1ff9
  陈志良 authored Aug 31, 2015
  
  498c1ff9
- Merge branch 'Gabriel_0831' · 7b15a4de
  陈志良 authored Aug 31, 2015
  
  7b15a4de
- Merge branch 'Gabriel_0831' into SANDBOX · 103edb87
  陈志良 authored Aug 31, 2015
  
  103edb87
- 1 · 2bfa7e12
  陈志良 authored Aug 31, 2015
  
  2bfa7e12
- Merge branch 'Gabriel_0831' · 1281c270
  陈志良 authored Aug 31, 2015
  
  1281c270
- 按创建时间倒序查询文章 · 88f4822b
  陈志良 authored Aug 31, 2015
  
  88f4822b
- Merge branch 'Gabriel_0831' · d0f77068
  陈志良 authored Aug 31, 2015
```
Conflicts:
	app/service/forumThreadService.js
```
  d0f77068
- 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 ' · 1fccf906
  strong authored Aug 31, 2015
  
  1fccf906
- Merge commit 'f6e4ca0a ' into SANDBOX · 55018dfb
  strong authored Aug 31, 2015
  
  55018dfb
- 测试 · f6e4ca0a
  刘文胜 authored Aug 31, 2015
  
  f6e4ca0a