Commits · 3f56a3be98e78db12f7c124003d5cb617ca98e1b · Nitipat Lowichakornthikun ( เต้ย ) / seedcamp

23 Aug, 2016 1 commit
- post page · 3f56a3be
  nuttapong authored 8 years ago
  
  3f56a3be
22 Aug, 2016 4 commits
- แก้เรื่องรูป · 2a1003bf
  nuttapong authored 8 years ago
  
  2a1003bf
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · 0925b70a
  nuttapong authored 8 years ago
  
  0925b70a
- no message · 12ea9283
  nuttapong authored 8 years ago
  
  12ea9283
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · 4d660c4d
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	resources/views/post/newsfeed.blade.php
```
  4d660c4d
19 Aug, 2016 11 commits
- no message · 79a68fda
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  79a68fda
- no message · dfa12914
  nuttapong authored 8 years ago
  
  dfa12914
- Merge branch 'develop' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · c2bdb126
  nuttapong authored 8 years ago
  
  c2bdb126
- test · 4fc748c2
  nuttapong authored 8 years ago
  
  4fc748c2
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · 23574222
  nuttapong authored 8 years ago
  
  23574222
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · fbb76435
  nuttapong authored 8 years ago
```
# Conflicts:
#	resources/views/post/newsfeed.blade.php
#	resources/views/post/page_list.blade.php
```
  fbb76435
- Merge branch 'feature/page' into develop · 0ee47bde
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  0ee47bde
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · bd7a43d5
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/Auth/AuthController.php
#	composer.lock
```
  bd7a43d5
- แก้ขื่อ field จาก post_from เป็น user_type · 84c1df60
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  84c1df60
- แยกไฟล์ หน้า newfeed · 9425c7d6
  nuttapong authored 8 years ago
  
  9425c7d6
- no message · 65a9d889
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  65a9d889
18 Aug, 2016 13 commits
- จำกัดจำนวน list · 86a6d620
  nuttapong authored 8 years ago
  
  86a6d620
- no message · d4697387
  nuttapong authored 8 years ago
  
  d4697387
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · dc7da1eb
  nuttapong authored 8 years ago
  
  dc7da1eb
- no message · bdb072e1
  nuttapong authored 8 years ago
  
  bdb072e1
- แก้นิดนึง · 61c57fb4
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  61c57fb4
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · 2754ed1d
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/PageController.php
#	resources/views/page/view_page.blade.php
```
  2754ed1d
- แก้ follow เสร็จ · 86cc7c2c
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  86cc7c2c
- no message · f2b7c5af
  nuttapong authored 8 years ago
  
  f2b7c5af
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · 893a999a
  nuttapong authored 8 years ago
  
  893a999a
- no message · cf57c58c
  nuttapong authored 8 years ago
  
  cf57c58c
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · 7b68c814
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/PostController.php
```
  7b68c814
- แก้ follow · 16e50b9c
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  16e50b9c
- ทำ โชว์ group ทั้งหมด หน้า newsfeed · 3e31acbf
  nuttapong authored 8 years ago
  
  3e31acbf
16 Aug, 2016 9 commits
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · dd54bf41
  nuttapong authored 8 years ago
  
  dd54bf41
- no message · 930d021b
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  930d021b
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · 84129456
  nuttapong authored 8 years ago
  
  84129456
- เพิ่ม มายเกรด follow · 0876292f
  nuttapong authored 8 years ago
  
  0876292f
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · 5bc03bb1
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/PageController.php
```
  5bc03bb1
- สร้างปุ่มหน้า view_page ให้สามารถกดใช้งานได้/ · ae9fb844
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
ให้หน้า view_page โชว์ โดยเช็คจากผู้ล็อกอิน(หน้าจะต่างกันเล็กน้อยระหว่างเจ้าของ page กับ user อื่น)
```
  ae9fb844
- ทำ edit page · 78b76c14
  nuttapong authored 8 years ago
  
  78b76c14
- Merge branch 'feature/page' of https://gitlab.thinknet.co.th/nitipat/seedcamp into page · f4a5ced7
  nuttapong authored 8 years ago
  
  f4a5ced7
- no message · ec03607b
  nuttapong authored 8 years ago
  
  ec03607b
15 Aug, 2016 2 commits
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · b4409088
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/PageController.php

=========
แก้ไขหน้า view_page
```
  b4409088
- สร้าง view_page · f1739e29
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  f1739e29