cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
532 Commits 33 Branches 0 Tags
e2cf3fecdd0c81fbec5672e06c778bc1c02de78b
Commit Graph

532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh e2cf3fecdd fix term1 no service charge 
fix navbar extra </li>
 2018-07-20 11:12:20 +08:00
Jack Goh aea6323a66 fix other loading button not working 2018-07-20 10:59:32 +08:00
Jack Goh f6c0d6aab3 Added navigation notice in user home page 
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

# Conflicts:
#	resources/assets/js/pages/home.vue
 2018-07-20 10:55:55 +08:00
Jack Goh a18f00c29f added production env sample 2018-07-20 10:26:18 +08:00
Jack Goh c63c4e6811 Merge branch 'fix/loadingButton' into 'master' 
complete orders/admin/refreshbutton

See merge request CIEFWorldwideSdnBhd/exchange!77
 2018-07-19 08:18:08 +00:00
lonetrinity a3717a19e2 complete orders/admin/refreshbutton 2018-07-19 16:16:27 +08:00
Jack Goh d87c45938d Merge branch 'fix/loadingButton' into 'master' 
Fix/loading button

See merge request CIEFWorldwideSdnBhd/exchange!76
 2018-07-19 08:01:05 +00:00
lonetrinity a322b8b798 fix unwanted line removal 2018-07-19 12:32:48 +08:00
lonetrinity fef401d76c fix conflict 2018-07-19 12:20:54 +08:00
lonetrinity b2e9d6f0c6 removed unstacked files 2018-07-19 12:19:56 +08:00
lonetrinity 18932c03c5 fix conflig 2018-07-19 12:18:54 +08:00
lonetrinity bd3f106e05 fix/loading for user done 2018-07-19 11:48:14 +08:00
Jack Goh 0bf30ac312 Merge branch 'deployment/staging' into 'master' 
Deployment/staging

See merge request CIEFWorldwideSdnBhd/exchange!75
 2018-07-19 03:31:05 +00:00
Jack Goh 6bb754ab9b removed unuse dockerfile 2018-07-19 11:28:30 +08:00
Jack Goh 74fda30311 added network to db in dockercompose 2018-07-19 11:10:03 +08:00
Jack Goh 73c3e8654b added mix-manifest to gitignore, because it differ from production and dev 2018-07-19 11:02:04 +08:00
Jack Goh 4469919950 fix db address error 2018-07-19 10:58:25 +08:00
Jack Goh 73d00d8d42 commited temp file 2018-07-19 10:53:35 +08:00
lonetrinity 37fdf32af1 fixed admin refresh button with loading 2018-07-19 10:11:31 +08:00
Jack Goh f3118454b1 fix mysql setting on docker compose 2018-07-19 09:55:23 +08:00
Jack Goh 1a7dc820a9 fix production frontend issue 2018-07-19 09:51:35 +08:00
Jack Goh 8cf011c59c test with app env check 2018-07-19 09:49:44 +08:00
Jack Goh 67c5b0c97b fix webpackjson not found 2018-07-19 09:47:09 +08:00
Jack Goh b0071d1000 updated production frontend error 2018-07-18 22:20:49 +08:00
Jack Goh 403d250869 fix permission deined issue 2018-07-18 19:22:47 +08:00
Jack Goh e93d801e73 fix storage permission deined 2018-07-18 19:17:00 +08:00
Jack Goh cd2e06c507 fix permission deined issue 2018-07-18 19:02:51 +08:00
Jack Goh f17ce7e159 fix permission denined issue 2018-07-18 18:48:19 +08:00
Jack Goh db7f99d653 fix permission denied issue 2018-07-18 18:46:53 +08:00
Jack Goh c60439d183 fix permission denied issue 2018-07-18 18:45:59 +08:00
Jack Goh 98dc01f2ea fix permission deined issue 2018-07-18 18:06:53 +08:00
Jack Goh 7e4cce9a28 update dockerfile to fix permission error 2018-07-18 17:56:53 +08:00
Jack Goh 3678bcc143 fix storage access denied 2018-07-18 17:48:48 +08:00
Jack Goh 0a4ab27ccb rollback to old dockerfile 2018-07-18 17:43:12 +08:00
Jack Goh 0ee09e3e59 added network to db 2018-07-18 17:33:41 +08:00
Jack Goh b535ddf80c updated caddyfile 2018-07-18 17:29:42 +08:00
Jack Goh 0c7ae77133 updated caddyfile 2018-07-18 16:36:31 +08:00
Jack Goh 4120f33ff8 updated working_dir for app 2018-07-18 16:31:31 +08:00
Jack Goh 84d35cc2a4 updated caddyfile 2018-07-18 16:22:36 +08:00
Jack Goh 991c54517d updated volume for app 2018-07-18 16:11:02 +08:00
Jack Goh 448a1b0c61 fix wrong docker compose format 2018-07-18 16:08:48 +08:00
Jack Goh d24a165492 added network to app and caddy 2018-07-18 16:07:38 +08:00
Jack Goh 57266430dc updated app volumes to caddy 
removed laradock
 2018-07-18 16:04:26 +08:00
Jack Goh 10fd101c80 switched back to port 8080 2018-07-18 15:55:37 +08:00
Jack Goh 37c4ecbf74 updated port to port 80 2018-07-18 15:50:22 +08:00
Jack Goh b631e8a7a2 fix dockercompose error 2018-07-18 15:39:08 +08:00
Jack Goh acc227c2ca fix wrong docker config 2018-07-18 15:37:40 +08:00
Jack Goh 9dee79c783 fix error 2018-07-18 15:25:10 +08:00
Jack Goh 8b8f0f7bf0 removed nginx 
added caddy
 2018-07-18 15:24:01 +08:00
Jack Goh 9339997d7e recommit files 2018-07-18 14:59:45 +08:00