Commits · f80fc0b2cb33e26179e3cf086fb518a8f1a37531 · smart_core_connect / core-connect · GitLab

31 May, 2018 19 commits
- update ViewCards · f80fc0b2
  Wittaya-PIM committed May 31, 2018
  
  f80fc0b2 Browse Files
- teeradone accept incomming · 0150f2db
  Teeradone Darunnat committed May 31, 2018
  
  0150f2db Browse Files
- Merge branch 'integration' into teeradone · ba52050f
```
# Conflicts:
#	www/src/Template/Profiles/index.ctp
```
  Teeradone Darunnat committed May 31, 2018
  ba52050f Browse Files
- teeradone แปลไฟล์ .mo en_EN · 0da4c9bb
  Teeradone Darunnat committed May 31, 2018
  
  0da4c9bb Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · 7c9408b0
  Zen-PC\Zen committed May 31, 2018
  
  7c9408b0 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen: ภาษาไทย Profiles/index · aed586b3
  Zen-PC\Zen committed May 31, 2018
  
  aed586b3 Browse Files
- Merge branch 'integration' into prasong · 5d33e689
  Prasong Putichanchai committed May 31, 2018
  
  5d33e689 Browse Files
- add locale · 09987581
  Prasong Putichanchai committed May 31, 2018
  
  09987581 Browse Files
- update view card · c3791942
  Prasong Putichanchai committed May 31, 2018
  
  c3791942 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : create language file · f95aaefb
  Zen-PC\Zen committed May 31, 2018
  
  f95aaefb Browse Files
- no message · 5da775bb
  Prasong Putichanchai committed May 31, 2018
  
  5da775bb Browse Files
- update user con · 1f2c42df
  Prasong Putichanchai committed May 31, 2018
  
  1f2c42df Browse Files
- Merge branch 'integration' into prasong · c06a328c
  Prasong Putichanchai committed May 31, 2018
  
  c06a328c Browse Files
- update view card · 45b027dd
  Prasong Putichanchai committed May 31, 2018
  
  45b027dd Browse Files
- teeradone update style · 05f26068
  Teeradone-PIM committed May 31, 2018
  
  05f26068 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update style textbox · 7bde3545
  Zen-PC\Zen committed May 31, 2018
  
  7bde3545 Browse Files
- Merge branch 'prasong' into integration · d4a9f4fa
  Prasong Putichanchai committed May 31, 2018
  
  d4a9f4fa Browse Files
- add layout login · dfe63f32
  Prasong Putichanchai committed May 31, 2018
  
  dfe63f32 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : new UserController · 1985886c
  Zen-PC\Zen committed May 31, 2018
  
  1985886c Browse Files
30 May, 2018 11 commits
- Merge branch 'integration' into prasong · dfd654f4
```
# Conflicts:
#	www/src/Controller/UsersController.php
```
  Prasong Putichanchai committed May 30, 2018
  dfd654f4 Browse Files
- no message · d39b375e
  Prasong Putichanchai committed May 30, 2018
  
  d39b375e Browse Files
- Merge branch 'teeradone' into integration · fe787816
  Teeradone-PIM committed May 30, 2018
  
  fe787816 Browse Files
- teeradone · 7a1d7643
  Teeradone-PIM committed May 30, 2018
  
  7a1d7643 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · f0730d60
  Zen-PC\Zen committed May 30, 2018
  
  f0730d60 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update Profiles · 88e3c9fb
  Zen-PC\Zen committed May 30, 2018
  
  88e3c9fb Browse Files
- Merge branch 'teeradone' into integration · 62526bbc
  Teeradone-PIM committed May 30, 2018
  
  62526bbc Browse Files
- แก้ไขรูปตากดไม่แสดงpasswordและคำว่าอีเมล · 37037e64
  Teeradone-PIM committed May 30, 2018
  
  37037e64 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · c818f456
  Zen-PC\Zen committed May 30, 2018
  
  c818f456 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : edit Lable for Profile/index · d175c70b
  Zen-PC\Zen committed May 30, 2018
  
  d175c70b Browse Files
- ปรับหน้า ViewCards · 5e3f8cf2
  Wittaya-PIM committed May 30, 2018
  
  5e3f8cf2 Browse Files
25 May, 2018 6 commits
- Merge branch 'integration' into prasong · f7e7521f
```
# Conflicts:
#	www/src/Template/Users/signup.ctp
```
  Prasong Putichanchai committed May 25, 2018
  f7e7521f Browse Files
- user signup · 3584bfa3
  Prasong Putichanchai committed May 25, 2018
  
  3584bfa3 Browse Files
- teeradone: validate change and email sent username · 3cd64980
  Teeradone-PIM committed May 25, 2018
  
  3cd64980 Browse Files
- teeradone eye icon · e9e87d00
  Teeradone-PIM committed May 25, 2018
  
  e9e87d00 Browse Files
- Merge branch 'integration' into teeradone · df16edbc
  Teeradone-PIM committed May 25, 2018
  
  df16edbc Browse Files
- teeradone comment · 8ec7ae94
  Teeradone-PIM committed May 25, 2018
  
  8ec7ae94 Browse Files
24 May, 2018 4 commits
- Merge branch 'integration' of… · 5cf12ded
```
Merge branch 'integration' of http://gitlab.pakgon.com/Smart_Core_connect/core-connect into integration
```
  Wittaya-PIM committed May 24, 2018
  5cf12ded Browse Files
- Merge branch 'integration' into wittaya · 8a013889
  Wittaya-PIM committed May 24, 2018
  
  8a013889 Browse Files
- Aof : update ViweCards · 70397ecd
  Wittaya-PIM committed May 24, 2018
  
  70397ecd Browse Files
- Merge branch 'integration' into teeradone · 5aebbf9a
  Teeradone-PIM committed May 24, 2018
  
  5aebbf9a Browse Files