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

16 Aug, 2016 1 commit

สร้างปุ่มหน้า view_page ให้สามารถกดใช้งานได้/ · ae9fb844

Nadchanon Susutlertpanya(บิว) authored 8 years ago

ให้หน้า view_page โชว์ โดยเช็คจากผู้ล็อกอิน(หน้าจะต่างกันเล็กน้อยระหว่างเจ้าของ page กับ user อื่น)

ae9fb844

15 Aug, 2016 14 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
- เพิ่ม validate form create · a7413385
  nuttapong authored 8 years ago
  
  a7413385
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · f43d942d
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  f43d942d
- test conflict · 421e8496
  nuttapong authored 8 years ago
  
  421e8496
- no message · 4f6d478c
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  4f6d478c
- Merge branch 'page' of gitlab.thinknet.co.th:nitipat/seedcamp into feature/page · 3fe78015
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
```
# Conflicts:
#	app/Http/Controllers/PageController.php
#	app/Http/routes.php
```
  3fe78015
- create view_page.blade.php · a0259b20
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  a0259b20
- no message · b63a03b1
  nuttapongk authored 8 years ago
  
  b63a03b1
- no message · 0e7365b1
  nuttapongk authored 8 years ago
  
  0e7365b1
- no message · 36b00d70
  nuttapongk authored 8 years ago
  
  36b00d70
- no message · 0ced54ff
  Nadchanon Susutlertpanya(บิว) authored 8 years ago
  
  0ced54ff
- no message · 0dd6987d
  nuttapongk authored 8 years ago
  
  0dd6987d
- no message · 66b2ddd0
  nuttapongk authored 8 years ago
  
  66b2ddd0
03 Aug, 2016 8 commits
- delete ban upload photo · 08e03e4b
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  08e03e4b
- แก้บัคลิงรูปคอมเม้นไปหน้า feed · 8a4b7b1f
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  8a4b7b1f
- Merge commit '9e1432c0 ' into develop · 41cb6175
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  41cb6175
- แก้ css · 94e4ddcc
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  94e4ddcc
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · 9e1432c0
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
```
# Conflicts:
#	resources/views/layouts/app.blade.php
```
  9e1432c0
- Merge branch 'feature/robotTest' into develop · 766cdfae
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
```
# Conflicts:
#	resources/views/post/newsfeed.blade.php
```
  766cdfae
- แก้ dropdown + แก้ email · a5adeae9
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  a5adeae9
- แก้ name · 05c6125a
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  05c6125a
02 Aug, 2016 7 commits
- edit style modal & define name of tag for check robot test · 48596122
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  48596122
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · 3d61f0d3
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  3d61f0d3
- get out edit alert · 3d30ddeb
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  3d30ddeb
- add id post-btn · 2f3dc648
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  2f3dc648
- move robot test to new git · 2cd0e570
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  2cd0e570
- fix nav bar · 2043db88
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  2043db88
- fix link + robot test · 6418ed32
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  6418ed32
29 Jul, 2016 1 commit
- Merge branch 'feature/TestCase' into develop · 86075f2e
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  86075f2e
28 Jul, 2016 7 commits
- delete comment · 64a9665c
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  64a9665c
- edit test feed · d75ab801
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  d75ab801
- fix css newsfeed / add dropdown in feed · ad9e1b0b
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  ad9e1b0b
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · beaa48fb
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  beaa48fb
- test file · 212a033e
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  212a033e
- edit newsfeed.js about comment · 6686acde
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  6686acde
- Merge branch 'feature/Feed' into develop · 71e4b142
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
```
Conflicts:
	app/Http/Controllers/PostController.php
	database/factories/UserFactory.php
	public/css/newsfeed.css
	public/js/newsfeed.js
	resources/views/post/newsfeed.blade.php

solve config
```
  71e4b142
27 Jul, 2016 2 commits
- Merge branch 'feature/edit_postcomment' into develop · 07e898db
  Nichanan Poovanavirote (เตย) authored 8 years ago
  
  07e898db
- delete ExampleTest.php · 306a176e
  Oraphan Itritmeechai (เฟิร์น) authored 8 years ago
  
  306a176e