 lonetrinity
|
1773a94fb8
|
mergeConflict
|
2018-09-07 12:14:43 +08:00 |
|
|
lonetrinity
|
04351e1f92
|
adminPaging
|
2018-09-07 12:00:57 +08:00 |
|
 Jack Goh
|
0a754075de
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
# resources/assets/js/pages/home.vue
|
2018-09-03 14:41:39 +08:00 |
|
|
Jack Goh
|
af9967a864
|
remove USD sorting
fixed term sorting
|
2018-09-03 14:39:38 +08:00 |
|
|
Jack Goh
|
25d1dd4e9f
|
temporary disable cancel booking button due to untested feature
|
2018-09-03 14:19:36 +08:00 |
|
|
Jack Goh
|
7a2f55bca5
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
# public/mix-manifest.json
|
2018-09-03 14:14:43 +08:00 |
|
|
Jack Goh
|
994ef1b261
|
temporary disabled cancel button, due to not tested
|
2018-09-03 14:11:32 +08:00 |
|
|
Jack Goh
|
32986788dd
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn
|
2018-09-03 14:09:03 +08:00 |
|
|
Jack Goh
|
37a95e6d05
|
added po format
|
2018-09-03 13:35:31 +08:00 |
|
|
lonetrinity
|
fa752a087d
|
column marking
|
2018-08-28 11:01:23 +08:00 |
|
|
lonetrinity
|
ac9681956d
|
addMarkingcolumnToAdmin
|
2018-08-27 18:00:25 +08:00 |
|
|
lonetrinity
|
a31d1ddf3f
|
lingges/featureSorting
|
2018-08-27 17:46:48 +08:00 |
|
|
lonetrinity
|
31653556f5
|
lingges/featureSorting
|
2018-08-25 13:04:48 +08:00 |
|
|
lonetrinity
|
3972bf2f63
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into cancelBooking
|
2018-08-24 16:07:23 +08:00 |
|
|
lonetrinity
|
a88fdb62ae
|
merge
|
2018-08-24 16:07:09 +08:00 |
|
|
Jack Goh
|
da55ae0c3d
|
Merge branch 'fix/admin-status-button' into 'master'
fixed the View status button on admin completed order
See merge request CIEFWorldwideSdnBhd/exchange!127
|
2018-08-23 10:06:58 +00:00 |
|
|
Jack Goh
|
19ba992608
|
added bank name label to active bank setting dropdown list
|
2018-08-23 10:11:56 +08:00 |
|
 Mohd Arief
|
c3cd1d70ea
|
fixed the View status button on admin completed order
|
2018-08-21 12:02:35 +08:00 |
|
|
Mohd Arief
|
9740392d4c
|
fixed conflict
|
2018-08-17 11:26:14 +08:00 |
|
|
Mohd Arief
|
16e7efa108
|
updated the refresh button function
|
2018-08-17 11:21:41 +08:00 |
|
|
Mohd Arief
|
d6eb6576d3
|
updated refresh button
|
2018-08-17 11:13:17 +08:00 |
|
|
Mohd Arief
|
df068d8c71
|
Revert "fixed the refresh button for completed order"
This reverts commit 424097e035.
|
2018-08-17 11:07:26 +08:00 |
|
|
Mohd Arief
|
424097e035
|
fixed the refresh button for completed order
|
2018-08-17 11:00:35 +08:00 |
|
|
Jack Goh
|
37a22322f4
|
updated pusher to use environtment key
|
2018-08-17 09:36:08 +08:00 |
|
|
Jack Goh
|
57331363c0
|
update realtime rate on user home page
|
2018-08-16 17:11:39 +08:00 |
|
|
Jack Goh
|
d295b5d9b4
|
removed some .env-example duplication config
updated rate updated event
added listener to user home page
|
2018-08-16 17:08:15 +08:00 |
|
|
Jack Goh
|
5bc4f5929d
|
removed all notifications code
|
2018-08-16 10:23:03 +08:00 |
|
|
Jack Goh
|
bc43a2ee1e
|
removed "please key in the data in chinese" label
|
2018-08-15 17:10:18 +08:00 |
|
|
Jack Goh
|
6e9f2b2d10
|
removed "please key in the data in chinese" label in footer
|
2018-08-15 17:07:25 +08:00 |
|
|
Jack Goh
|
0e5ed8f7f6
|
removed v-validate
updated some required field to non required field
|
2018-08-15 17:06:31 +08:00 |
|
|
Jack Goh
|
1d41c651b9
|
removed some required field on malaysia bank field
|
2018-08-15 17:02:19 +08:00 |
|
|
Jack Goh
|
53ce807aec
|
remove v-validate from admin malaysia bank setting
|
2018-08-15 16:58:34 +08:00 |
|
|
Jack Goh
|
7b1541a57f
|
fix typo
|
2018-08-15 16:36:41 +08:00 |
|
|
Jack Goh
|
1ee5b6952f
|
added bank name to bank setting select label
|
2018-08-15 15:21:55 +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
|
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
|
796e8bf6df
|
fix marking bug - when typing chinese
|
2018-08-13 12:07:15 +08:00 |
|
|
Jack Goh
|
91c0bec289
|
added bank name and bank branch to booking calcualation
|
2018-08-13 11:36:26 +08: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
|
6fe1fc4257
|
fix password reset link not found bug
|
2018-08-09 17:37:01 +08:00 |
|
|
Mohd Arief
|
615dff66fc
|
fixed the marking bug
|
2018-08-09 16:47:04 +08:00 |
|
|
Jack Goh
|
a9b30e2bb9
|
added supplier booking report to complete page at admin side
|
2018-08-09 12:08:03 +08:00 |
|