 Jack Goh
|
53ce807aec
|
remove v-validate from admin malaysia bank setting
|
2018-08-15 16:58:34 +08:00 |
|
|
Jack Goh
|
84358ce452
|
updated with no service charge
|
2018-08-15 16:38:03 +08:00 |
|
|
Jack Goh
|
7b1541a57f
|
fix typo
|
2018-08-15 16:36:41 +08:00 |
|
|
Jack Goh
|
3c88ea09d3
|
fix active bank save error
removed phpmyadmin proxy from caddyfile
|
2018-08-15 16:03:38 +08:00 |
|
|
Jack Goh
|
1ee5b6952f
|
added bank name to bank setting select label
|
2018-08-15 15:21:55 +08:00 |
|
|
Jack Goh
|
d42a59bc33
|
Merge branch 'admin_Completed_Order' into 'master'
Admin completed order
See merge request CIEFWorldwideSdnBhd/exchange!118
|
2018-08-15 06:47:26 +00:00 |
|
 lonetrinity
|
3a39f7407c
|
lingges fix_Status
|
2018-08-15 14:35:26 +08:00 |
|
|
lonetrinity
|
cbcb727099
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order
|
2018-08-14 10:58:41 +08:00 |
|
|
Jack Goh
|
0e5293327d
|
update x2 complete booking status
|
2018-08-14 10:48:13 +08:00 |
|
|
lonetrinity
|
daa73f6cf2
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order
|
2018-08-14 10:29:24 +08:00 |
|
|
lonetrinity
|
05e2846780
|
merge master
|
2018-08-14 10:29:03 +08:00 |
|
|
Jack Goh
|
70ef164ebc
|
updated change log
|
2018-08-13 18:07:18 +08:00 |
|
|
Jack Goh
|
e86ce45689
|
Merge branch 'fix/slice-error' into 'master'
Fix/slice error
See merge request CIEFWorldwideSdnBhd/exchange!117
|
2018-08-13 08:40:27 +00:00 |
|
|
Jack Goh
|
0bf62c00dc
|
fix admin index table dont show completed
|
2018-08-13 16:33:33 +08:00 |
|
|
Jack Goh
|
b07c44324a
|
fix bank_branch error
|
2018-08-13 16:30:55 +08:00 |
|
|
Jack Goh
|
651690d275
|
fix bank branch error
|
2018-08-13 16:25:51 +08:00 |
|
|
Jack Goh
|
e55b3b9300
|
fix supplier booking error
|
2018-08-13 16:22:45 +08:00 |
|
|
Jack Goh
|
1201107b22
|
drop billing_amount column in supplier booking
|
2018-08-13 16:20:07 +08:00 |
|
|
Jack Goh
|
c2d93d9ae0
|
fix phpmyadmin network error
|
2018-08-13 16:13:54 +08:00 |
|
|
Jack Goh
|
ec04c76bbe
|
Merge branch 'fix/slice-error' into 'master'
fix caddy error
See merge request CIEFWorldwideSdnBhd/exchange!116
|
2018-08-13 07:55:00 +00:00 |
|
|
Jack Goh
|
25f42e9636
|
fix caddy error
|
2018-08-13 15:49:26 +08:00 |
|
|
Jack Goh
|
5821ec80b2
|
Merge branch 'fix/slice-error' into 'master'
Fix/slice error
See merge request CIEFWorldwideSdnBhd/exchange!115
|
2018-08-13 07:39:16 +00:00 |
|
|
Jack Goh
|
4e81548b12
|
remove build to speed up deploy process
added phpmyadmin to production
added phpmyadmin proxy to caddy
|
2018-08-13 15:33:10 +08:00 |
|
|
Jack Goh
|
ff9db8e6ff
|
fix user completed table
|
2018-08-13 15:12:31 +08:00 |
|
|
Jack Goh
|
35cfdfeaa9
|
Merge branch 'fix/slice-error' into 'master'
fix booking not found bug
See merge request CIEFWorldwideSdnBhd/exchange!114
|
2018-08-13 07:10:26 +00:00 |
|
|
Jack Goh
|
a68095f203
|
fix booking not found bug
|
2018-08-13 15:04:36 +08:00 |
|
|
Jack Goh
|
f35bb1c43c
|
Merge branch 'fix/slice-error' into 'master'
fix slice error in user transfer page
See merge request CIEFWorldwideSdnBhd/exchange!113
|
2018-08-13 06:52:14 +00:00 |
|
|
Jack Goh
|
0c7cd0b201
|
fix slice error in user transfer page
|
2018-08-13 14:46:23 +08:00 |
|
|
Jack Goh
|
a938aab8fe
|
Merge branch 'fix/frontend-marking' into 'master'
fix marking bug - when typing chinese
See merge request CIEFWorldwideSdnBhd/exchange!112
|
2018-08-13 06:09:28 +00:00 |
|
|
Jack Goh
|
1337c1cd4e
|
fix marking factory to make marking capital letter
|
2018-08-13 14:03:49 +08:00 |
|
|
Jack Goh
|
b5c8688a56
|
fix unknow column when testing
|
2018-08-13 12:40:08 +08:00 |
|
|
Jack Goh
|
356b1e5267
|
remove complete order nav from admin
updated name of the tab
|
2018-08-13 12:27:55 +08:00 |
|
|
Jack Goh
|
92fe8d99f7
|
fix bankslip aprrove bug
|
2018-08-13 12:22:26 +08:00 |
|
|
Jack Goh
|
2910a9037a
|
fix upload user bankslip error
|
2018-08-13 12:18:44 +08:00 |
|
|
Jack Goh
|
796e8bf6df
|
fix marking bug - when typing chinese
|
2018-08-13 12:07:15 +08:00 |
|
|
Jack Goh
|
40b3b8b680
|
Merge branch 'fix/bookingtable-bankname' into 'master'
added bank name and bank branch to booking calcualation
See merge request CIEFWorldwideSdnBhd/exchange!111
|
2018-08-13 03:41:46 +00:00 |
|
|
Jack Goh
|
91c0bec289
|
added bank name and bank branch to booking calcualation
|
2018-08-13 11:36:26 +08:00 |
|
|
Jack Goh
|
148f771098
|
Merge branch 'fix/bookingTable/Lingges' into 'master'
Fix/booking table/lingges
See merge request CIEFWorldwideSdnBhd/exchange!105
|
2018-08-13 03:02:25 +00:00 |
|
|
lonetrinity
|
326ef7dd5f
|
fix/mergeConflicts
|
2018-08-11 10:30:16 +08:00 |
|
|
lonetrinity
|
98db669a64
|
fix/discussionResolved
|
2018-08-11 10:23:15 +08:00 |
|
|
lonetrinity
|
385cd33211
|
resolved discussion
|
2018-08-10 18:15:55 +08:00 |
|
|
lonetrinity
|
3f38fef845
|
fixPaginationAdmin_and_user
|
2018-08-10 17:45:01 +08:00 |
|
|
Jack Goh
|
6442a58746
|
remove remember me because it does nothing
|
2018-08-10 17:41:23 +08:00 |
|
|
Jack Goh
|
144b57bc52
|
fix upload user bankslip page bug
|
2018-08-10 09:49:34 +08:00 |
|
|
Jack Goh
|
37ade40cdd
|
added change log
|
2018-08-09 18:02:37 +08:00 |
|
|
Jack Goh
|
9a07a11a2d
|
Merge branch 'fix/marking' into 'master'
fix password reset link not found bug
See merge request CIEFWorldwideSdnBhd/exchange!110
|
2018-08-09 09:42:57 +00:00 |
|
|
Jack Goh
|
6fe1fc4257
|
fix password reset link not found bug
|
2018-08-09 17:37:01 +08:00 |
|
|
Jack Goh
|
e6b987358f
|
Merge branch 'fix/marking' into 'master'
fixed the marking bug
See merge request CIEFWorldwideSdnBhd/exchange!109
|
2018-08-09 09:10:55 +00:00 |
|
 Mohd Arief
|
615dff66fc
|
fixed the marking bug
|
2018-08-09 16:47:04 +08:00 |
|
|
Jack Goh
|
de0c9fabc4
|
update send reset link success message
|
2018-08-09 16:16:45 +08:00 |
|