Commits · d4bc76e6b447ceb10d02c81945202353bced0da5 · smart_core_connect / core-connect · GitLab

22 May, 2018 8 commits
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · d4bc76e6
  Zen-PC\Zen committed May 22, 2018
  
  d4bc76e6 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update viewCard BG · 53deb96f
  Zen-PC\Zen committed May 22, 2018
  
  53deb96f Browse Files
- Merge branch 'integration' into wittaya · ea0117b1
  Wittaya-PIM committed May 22, 2018
  
  ea0117b1 Browse Files
- Aof : Add UserEntity หลัง Add UserCards สำเร็จ · 9b7a9912
  Wittaya-PIM committed May 22, 2018
  
  9b7a9912 Browse Files
- Merge branch 'integration' into teeradone · c9ff32ad
  Teeradone-PIM committed May 22, 2018
  
  c9ff32ad Browse Files
- teeradone edit · a95dafc9
  Teeradone-PIM committed May 22, 2018
  
  a95dafc9 Browse Files
- Aof : หน้า viweCards เพิ่ม alert แจ้งเตือน · 9dba9ad1
  Wittaya-PIM committed May 22, 2018
  
  9dba9ad1 Browse Files
- Merge branch 'integration' of… · b422017f
```
Merge branch 'integration' of http://gitlab.pakgon.com/Smart_Core_connect/core-connect into integration

# Conflicts:
#	www/src/Controller/UserCardsController.php
```
  Wittaya-PIM committed May 22, 2018
  b422017f Browse Files
21 May, 2018 15 commits
- update card · b1632bdb
  Prasong Putichanchai committed May 21, 2018
  
  b1632bdb Browse Files
- Merge branch 'integration' into teeradone · 5f361851
  Teeradone-PIM committed May 21, 2018
  
  5f361851 Browse Files
- teeradone composer · e6ede68f
  Teeradone-PIM committed May 21, 2018
  
  e6ede68f Browse Files
- Merge branch 'integration' into prasong · 671cae96
```
# Conflicts:
#	www/src/Controller/ProfilesController.php
```
  Prasong Putichanchai committed May 21, 2018
  671cae96 Browse Files
- update user · 48da6edc
  Prasong Putichanchai committed May 21, 2018
  
  48da6edc Browse Files
- Aof : ย้าย funtion ceateCards ไปรวมกับ funtion viewCards และอัฟเดทข้อมูลใน Temp · 658fa6f9
  Wittaya-PIM committed May 21, 2018
  
  658fa6f9 Browse Files
- Merge branch 'integration' into teeradone · f63c5d65
  Teeradone-PIM committed May 21, 2018
  
  f63c5d65 Browse Files
- teeradone · c4abb1f6
  Teeradone-PIM committed May 21, 2018
  
  c4abb1f6 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : composer update · 9a744ad6
  Zen-PC\Zen committed May 21, 2018
  
  9a744ad6 Browse Files
- $Zen-PC\Zen's avatar$
  Merge branch 'integration' into kraikrit · fc9ff95a
```
# Conflicts:
#	www/src/Controller/ProfilesController.php
```
  Zen-PC\Zen committed May 21, 2018
  fc9ff95a Browse Files
- $Zen-PC\Zen's avatar$
  
  zen : update · 1de13390
  Zen-PC\Zen committed May 21, 2018
  
  1de13390 Browse Files
- Merge branch 'integration' into teeradone · 638cb0bb
  Teeradone-PIM committed May 21, 2018
  
  638cb0bb Browse Files
- teeradone is_use · 6a12e1b3
  Teeradone-PIM committed May 21, 2018
  
  6a12e1b3 Browse Files
- 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 17 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