Commits · 24bf50f38cce8945f2456098cd1862ec00a71808 · smart_core_connect / core-connect · GitLab

21 May, 2018 2 commits
- Merge branch 'integration' into prasong · 24bf50f3
  Prasong Putichanchai committed May 21, 2018
  
  24bf50f3 Browse Files
- upate code · 5b314587
  Prasong Putichanchai committed May 21, 2018
  
  5b314587 Browse Files
18 May, 2018 26 commits
- Aof : อัฟเดท Viwecards · 17699c43
  Wittaya-PIM committed May 18, 2018
  
  17699c43 Browse Files
- Merge branch 'integration' into wittaya · aa0913b0
  Wittaya-PIM committed May 18, 2018
  
  aa0913b0 Browse Files
- Aof : ใส่ข้อูลในมอด้อการ์ด · ad352506
  Wittaya-PIM committed May 18, 2018
  
  ad352506 Browse Files
- Merge branch 'integration' into prasong · b6a98872
  Prasong Putichanchai committed May 18, 2018
  
  b6a98872 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · c1dff3e9
  Zen-PC\Zen committed May 18, 2018
  
  c1dff3e9 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update card and add provinces · d4d42bfd
  Zen-PC\Zen committed May 18, 2018
  
  d4d42bfd Browse Files
- Merge branch 'integration' into prasong · 42eec8a0
```
# Conflicts:
#	www/src/Controller/UsersController.php
```
  Prasong Putichanchai committed May 18, 2018
  42eec8a0 Browse Files
- update user · 83b770af
  Prasong Putichanchai committed May 18, 2018
  
  83b770af Browse Files
- Merge branch 'integration' into teeradone · f2a1c246
  Teeradone-PIM committed May 18, 2018
  
  f2a1c246 Browse Files
- teeradone: regster แก้ไข Province · 2d65c262
  Teeradone-PIM committed May 18, 2018
  
  2d65c262 Browse Files
- Merge branch 'integration' into wittaya · 868107e4
  Wittaya-PIM committed May 18, 2018
  
  868107e4 Browse Files
- Aof ปรับวันที่ · 304670a3
  Wittaya-PIM committed May 18, 2018
  
  304670a3 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update · 46092de0
  Zen-PC\Zen committed May 18, 2018
  
  46092de0 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · fcce0e50
  Zen-PC\Zen committed May 18, 2018
  
  fcce0e50 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update provainec box and add link for fa-arrow · 9e6c0a7a
  Zen-PC\Zen committed May 18, 2018
  
  9e6c0a7a Browse Files
- Merge branch 'integration' into teeradone · 3e1fe137
  Teeradone-PIM committed May 18, 2018
  
  3e1fe137 Browse Files
- teeradone: register and forgot_password · 3fad2af2
  Teeradone-PIM committed May 18, 2018
  
  3fad2af2 Browse Files
- Merge branch 'integration' into wittaya · 5681bf63
  Wittaya-PIM committed May 18, 2018
  
  5681bf63 Browse Files
- Aof updateในส่วนของวันที่หน้า viwecard · 80675538
  Wittaya-PIM committed May 18, 2018
  
  80675538 Browse Files
- Aof รวม viwecard กับ createcard · 402a1f40
  Wittaya-PIM committed May 18, 2018
  
  402a1f40 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · fc44746c
  Zen-PC\Zen committed May 18, 2018
  
  fc44746c Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : remove scritp and move gender feild · db5e17f1
  Zen-PC\Zen committed May 18, 2018
  
  db5e17f1 Browse Files
- Merge branch 'integration' into wittaya · 5d36368d
  Wittaya-PIM committed May 18, 2018
  
  5d36368d Browse Files
- Aof update · 7de2e5d2
  Wittaya-PIM committed May 18, 2018
  
  7de2e5d2 Browse Files
- update view card · eda07603
  Prasong Putichanchai committed May 18, 2018
  
  eda07603 Browse Files
- update code · cddd26f3
  Prasong Putichanchai committed May 18, 2018
  
  cddd26f3 Browse Files
17 May, 2018 12 commits
- Merge branch 'integration' into prasong · 1cf0d336
  Prasong Putichanchai committed May 17, 2018
  
  1cf0d336 Browse Files
- $Zen-PC\Zen's avatar$
  Merge branch 'integration' into kraikrit · c5581a40
```
# Conflicts:
#	www/src/Controller/UsersController.php
```
  Zen-PC\Zen committed May 17, 2018
  c5581a40 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update big card · 4f81c251
  Zen-PC\Zen committed May 17, 2018
  
  4f81c251 Browse Files
- Aof : viwecards · ab409676
  Wittaya-PIM committed May 17, 2018
  
  ab409676 Browse Files
- Merge branch 'integration' into teeradone · 881e905a
  Teeradone-PIM committed May 17, 2018
  
  881e905a Browse Files
- teeradone: users · 6648f3eb
  Teeradone-PIM committed May 17, 2018
  
  6648f3eb Browse Files
- Aof : viwe cards · 4b8b6925
  Wittaya-PIM committed May 17, 2018
  
  4b8b6925 Browse Files
- Merge branch 'teeradone' into integration · a9028a7d
  Teeradone-PIM committed May 17, 2018
  
  a9028a7d Browse Files
- test · bf301f15
  Teeradone-PIM committed May 17, 2018
  
  bf301f15 Browse Files
- Merge branch 'teeradone' into integration · 96be74a2
```
# Conflicts:
#	www/src/Template/Users/signup.ctp
```
  Teeradone-PIM committed May 17, 2018
  96be74a2 Browse Files
- Merge branch 'integration' of… · 32088e4a
```
Merge branch 'integration' of http://gitlab.pakgon.com/Smart_Core_connect/core-connect into integration

# Conflicts:
#	www/src/Template/Users/signup.ctp
```
  Teeradone-PIM committed May 17, 2018
  32088e4a Browse Files
- teeradone register · 854e41de
  Teeradone-PIM committed May 17, 2018
  
  854e41de Browse Files