Commits · 46092de0b32f0091857058b18d1230d11dcf3cb8 · smart_core_connect / core-connect · GitLab

18 May, 2018 14 commits
- $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 17 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
- Merge remote-tracking branch 'integration/wittaya' into teeradone · 6876bbfb
```
# Conflicts:
#	www/src/Template/Users/signup.ctp
```
  Teeradone-PIM committed May 17, 2018
  6876bbfb Browse Files
- teeradone userscontroller/signup · c12a7dbd
  Teeradone-PIM committed May 17, 2018
  
  c12a7dbd Browse Files
- register · 33d6356c
  Wittaya-PIM committed May 17, 2018
  
  33d6356c Browse Files
- teeradone · 56fe1379
  Teeradone-PIM committed May 17, 2018
  
  56fe1379 Browse Files
- teeradone: register 2 · b91a2679
  Teeradone-PIM committed May 17, 2018
  
  b91a2679 Browse Files
16 May, 2018 9 commits
- Merge branch 'integration' into prasong · c50dfddf
  Prasong Putichanchai committed May 16, 2018
  
  c50dfddf Browse Files
- no message · 8c61459c
  Prasong Putichanchai committed May 16, 2018
  
  8c61459c Browse Files
- Aof update หน้า Addcards · b713d9fa
  Wittaya-PIM committed May 16, 2018
  
  b713d9fa Browse Files
- Merge branch 'integration' into wittaya · 31aafaee
  Wittaya-PIM committed May 16, 2018
  
  31aafaee Browse Files
- Aof update หน้า Addcards · dece6e4b
  Wittaya-PIM committed May 16, 2018
  
  dece6e4b Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · 0ae6c106
  Zen-PC\Zen committed May 16, 2018
  
  0ae6c106 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update email · f51bf3de
  Zen-PC\Zen committed May 16, 2018
  
  f51bf3de Browse Files
- Aof update หน้า Addcards · dd0993fb
  Wittaya-PIM committed May 16, 2018
  
  dd0993fb Browse Files
- Merge branch 'integration' into teeradone · df89422c
  Teeradone-PIM committed May 16, 2018
  
  df89422c Browse Files