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

10 Jun, 2016 40 commits
- image file · 9a10b3d4
  Nitipat authored 9 years ago
  
  9a10b3d4
- Merge branch 'feature/edit_profile_detail' into develop · f03f3310
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  f03f3310
- Merge branch 'develop' into feature/edit_profile_detail · d9411e6b
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
```
# Conflicts:
#	app/Http/routes.php
#	resources/views/user/profile.blade.php
```
  d9411e6b
- edit profile page · 5ba2d861
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  5ba2d861
- Merge branch 'feature/upload_fixed' into develop · ce78e4b9
  Nitipat authored 9 years ago
  
  ce78e4b9
- ok · 27f8d98d
  Nitipat authored 9 years ago
  
  27f8d98d
- Merge branch 'feature/pic_post' into develop · 82a1148b
  Kamonkwun Thawornyutitham (ขวัญ) authored 9 years ago
```
Conflicts:
	app/Http/routes.php
```
  82a1148b
- fix routes · f38730e4
  Kamonkwun Thawornyutitham (ขวัญ) authored 9 years ago
  
  f38730e4
- fix style in newsfeed · b9343439
  Kamonkwun Thawornyutitham (ขวัญ) authored 9 years ago
  
  b9343439
- Merge branch 'develop' into feature/upload_fixed · a5592b7d
  Nitipat authored 9 years ago
  
  a5592b7d
- Merge branch 'develop' into feature/edit_profile_detail · 19270a63
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  19270a63
- เต้ยทำพัง · 3afd67bb
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  3afd67bb
- ok · 33d6f396
  Nitipat authored 9 years ago
  
  33d6f396
- clean tabs · 68c9613f
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  68c9613f
- Merge branch 'develop' into feature/upload_fixed · eab263f0
  Nitipat authored 9 years ago
```
# Conflicts:
#	app/Http/routes.php
```
  eab263f0
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · 273c4cb4
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
```
# Conflicts:
#	app/Http/routes.php
```
  273c4cb4
- ok · 46253442
  Nitipat authored 9 years ago
  
  46253442
- fixed · 346c3e43
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  346c3e43
- Merge branch 'feature/timestamp_like' into develop · 2d315037
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  2d315037
- ok · 1021b5df
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  1021b5df
- Merge branch 'develop' into feature/timestamp_like · 3cf56f76
  Wudtichai Chumsangchotsagun authored 9 years ago
```
# By Nitipat
# Via Nitipat
* develop:
  ok
```
  3cf56f76
- fix · c9b6c898
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  c9b6c898
- Merge branch 'feature/test_ice' into develop · 9458c111
  Nitipat authored 9 years ago
  
  9458c111
- Merge branch 'develop' into feature/test_ice · c633bf5f
  Nitipat authored 9 years ago
  
  c633bf5f
- ok · b5c5c7bf
  Nitipat authored 9 years ago
  
  b5c5c7bf
- ok · 0865b741
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  0865b741
- Merge branch 'feature/route' into develop · a2ae11a3
  Wudtichai Chumsangchotsagun authored 9 years ago
```
Conflicts:
	app/Http/routes.php
```
  a2ae11a3
- ok · abe061f3
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  abe061f3
- Merge branch 'feature/ajax_like' into develop · fea6f76e
  Nitipat authored 9 years ago
  
  fea6f76e
- ok · ceae04c3
  Nitipat authored 9 years ago
  
  ceae04c3
- Merge branch 'develop' into feature/ajax_like · cc6b5f85
  Nitipat authored 9 years ago
  
  cc6b5f85
- test unlike · 89502db9
  Nitipat authored 9 years ago
  
  89502db9
- Merge branch 'develop' into feature/ajax_like · e36e7e78
  Nitipat authored 9 years ago
  
  e36e7e78
- Merge branch 'feature/likeable' into develop · 58cefbb0
  Wudtichai Chumsangchotsagun authored 9 years ago
```
Conflicts:
	app/Http/Controllers/PostController.php
```
  58cefbb0
- ok · 8871681c
  Nitipat authored 9 years ago
  
  8871681c
- likeable · 666b39a7
  Wudtichai Chumsangchotsagun authored 9 years ago
  
  666b39a7
- Merge branch 'feature/view_register' into develop · 3195d602
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  3195d602
- Merge branch 'develop' into feature/view_register · f2fce21a
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  f2fce21a
- edit ok · 2110c7e0
  Kamolpop Kuadsantia (ไอซ์) authored 9 years ago
  
  2110c7e0
- Merge branch 'newfeed_k' into develop · 76bd886c
  Kamonkwun Thawornyutitham (ขวัญ) authored 9 years ago
```
* newfeed_k:
  แก้บัค
  post comment
  news feed front
  no message
```
  76bd886c