Commits · 6728f6b8c9ebe490529273ff7ba5114e2aadd46c · smart_core_connect / core-connect · GitLab

01 Jun, 2018 5 commits
- teeradone default en_EN · 6728f6b8
  Teeradone Darunnat committed Jun 01, 2018
  
  6728f6b8 Browse Files
- Merge branch 'integration' into teeradone · a8c1e751
  Teeradone Darunnat committed Jun 01, 2018
  
  a8c1e751 Browse Files
- teeradone default · 32ba9f05
  Teeradone Darunnat committed Jun 01, 2018
  
  32ba9f05 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update · 82cf1067
  Zen-PC\Zen committed Jun 01, 2018
  
  82cf1067 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : viewCard change lable EN · b6b4639e
  Zen-PC\Zen committed Jun 01, 2018
  
  b6b4639e Browse Files
31 May, 2018 28 commits
- Merge branch 'integration' into teeradone · 7cd84950
  Teeradone Darunnat committed May 31, 2018
  
  7cd84950 Browse Files
- teeradone แปลง eng · 870bef27
  Teeradone Darunnat committed May 31, 2018
  
  870bef27 Browse Files
- update user con · 947fa85b
  Prasong Putichanchai committed May 31, 2018
  
  947fa85b Browse Files
- Merge branch 'integration' into wittaya · b6150ce3
  Wittaya-PIM committed May 31, 2018
  
  b6150ce3 Browse Files
- update ViewCards · f80fc0b2
  Wittaya-PIM committed May 31, 2018
  
  f80fc0b2 Browse Files
- Merge branch 'integration' into prasong · 46764a3e
  Prasong Putichanchai committed May 31, 2018
  
  46764a3e Browse Files
- update from · fa599bc6
  Prasong Putichanchai committed May 31, 2018
  
  fa599bc6 Browse Files
- $Zen-PC\Zen's avatar$
  
  Merge branch 'integration' into kraikrit · a13642d4
  Zen-PC\Zen committed May 31, 2018
  
  a13642d4 Browse Files
- $Zen-PC\Zen's avatar$
  
  Zen : update language · c071e788
  Zen-PC\Zen committed May 31, 2018
  
  c071e788 Browse Files
- teeradone เปลียนเป็น eng · 53263189
  Teeradone Darunnat committed May 31, 2018
  
  53263189 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 7 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