Commits · 6fc32d35794f4d8a3888b219e3a05a3508da46d4 · Nitipat Lowichakornthikun ( เต้ย ) / seedcamp · GitLab

10 Jun, 2016 40 commits
- redirect · 6fc32d35
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  6fc32d35
- redirectTo = posts · 10111c2f
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  10111c2f
- Merge branch 'feature/view_register' into develop · 43af5652
  Kamolpop Kuadsantia (ไอซ์) authored 8 years ago
  
  43af5652
- Merge branch 'develop' into feature/view_register · b3cced56
  Kamolpop Kuadsantia (ไอซ์) authored 8 years ago
  
  b3cced56
- Merge branch 'develop' into feature/view_register · 6b101435
  Kamolpop Kuadsantia (ไอซ์) authored 8 years ago
```
# Conflicts:
#	resources/views/templates/main.blade.php
```
  6b101435
- ok · bdfe0e59
  Nitipat authored 8 years ago
  
  bdfe0e59
- register success · d1dce554
  Kamolpop Kuadsantia (ไอซ์) authored 8 years ago
  
  d1dce554
- Merge branch 'feature/clean_code' into develop · 1cd55fce
  Nitipat authored 8 years ago
  
  1cd55fce
- Merge branch 'develop' into feature/clean_code · 26c0903d
  Nitipat authored 8 years ago
  
  26c0903d
- Merge branch 'feature/auth' into develop · dca9bcd6
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  dca9bcd6
- เปิดคอมเม้น · abfc4e6f
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  abfc4e6f
- clean · b165654a
  Nitipat authored 8 years ago
  
  b165654a
- Merge branch 'develop' into feature/auth · 024a0fc1
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
```
* develop:
  fix bug
  ok
  ok
  template uses bootstrap
  add bootstrap and css
  ok
```
  024a0fc1
- Add $username · 10593ef2
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  10593ef2
- ok · 06c37ac0
  Nitipat authored 8 years ago
  
  06c37ac0
- fix bug · eacc5982
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  eacc5982
- Merge branch 'feature/post_comment2' into develop · d2502b25
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  d2502b25
- ok · 85aeb3d9
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  85aeb3d9
- Merge branch 'feature/editprofile_controller' into develop · 4b89bcbf
  Nitipat authored 8 years ago
  
  4b89bcbf
- Merge branch 'develop' into feature/editprofile_controller · 4f410670
  Nitipat authored 8 years ago
```
# Conflicts:
#	app/Http/routes.php
```
  4f410670
- ok · ae9a65ca
  Nitipat authored 8 years ago
  
  ae9a65ca
- testtest · 18c8cdf6
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  18c8cdf6
- Merge branch 'develop' into feature/auth · cb764b08
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
```
* develop:
  Fix field username
```
  cb764b08
- Merge branch 'develop' of gitlab.thinknet.co.th:nitipat/seedcamp into develop · c0fc3cda
  Nutchalum Kitpongsai (นัช) authored 8 years ago
  
  c0fc3cda
- Merge branch 'feature/bootstrap_framework' into develop · c4aa0d70
  Nutchalum Kitpongsai (นัช) authored 8 years ago
  
  c4aa0d70
- template uses bootstrap · 22e41632
  Nutchalum Kitpongsai (นัช) authored 8 years ago
  
  22e41632
- Merge commit '358a1179 ' into develop · 6ce83128
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  6ce83128
- Fix field username · 56947a1a
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  56947a1a
- add bootstrap and css · 6aaf968f
  Nutchalum Kitpongsai (นัช) authored 8 years ago
  
  6aaf968f
- test · 6bc64ca3
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  6bc64ca3
- Merge branch 'develop' into feature/auth · c7f863f9
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
```
* develop:
  ok
  ok
  Fix type of database
  Fix username field
  ok
```
  c7f863f9
- test · 248f6892
  Kamonkwun Thawornyutitham (ขวัญ) authored 8 years ago
  
  248f6892
- ok · a4c57ba7
  Nitipat authored 8 years ago
  
  a4c57ba7
- Merge branch 'feature/post_comment' into develop · 358a1179
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  358a1179
- Merge branch 'develop' into feature/post_comment · 859986ae
  Wudtichai Chumsangchotsagun authored 8 years ago
```
# By Nattawut
# Via Nattawut
* develop:
  Fix type of database
  Fix username field
```
  859986ae
- ok · 3eb074e2
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  3eb074e2
- ok · 2064b7cb
  Wudtichai Chumsangchotsagun authored 8 years ago
  
  2064b7cb
- Merge branch 'feature/login_fix_username_field' into develop · 303e84f9
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  303e84f9
- Fix type of database · dd04491e
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  dd04491e
- Fix username field · 61d71b67
  Nattawut Dumnernpun ( เฟิร์ส ) - Obsolete authored 8 years ago
  
  61d71b67