omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 04:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
889 Commits 28 Branches 0 Tags
fixAdminHomeBug
Commit Graph

889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lonetrinity 1773a94fb8 mergeConflict 2018-09-07 12:14:43 +08:00
lonetrinity 04351e1f92 adminPaging 2018-09-07 12:00:57 +08:00
Jack Goh 9aaafd24d6 Merge branch 'feature/sorting' into 'master' 
Feature/sorting

See merge request CIEFWorldwideSdnBhd/exchange!131
 2018-09-03 06:47:07 +00: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 f8edb5c159 update changelog 2018-09-03 14:40:17 +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 0a165961db Merge branch 'addMarkingColumn' into 'master' 
Add marking column

See merge request CIEFWorldwideSdnBhd/exchange!132
 2018-09-03 06:16:38 +00: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 87dc08aabf WIP changelog 2018-09-03 14:13:52 +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 d38a3f16e9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting 2018-08-27 17:45:16 +08:00
Jack Goh 6b74883789 no message 2018-08-27 14:34:58 +08:00
lonetrinity 31653556f5 lingges/featureSorting 2018-08-25 13:04:48 +08:00
lonetrinity 81112e4080 cancelationBooking 2018-08-25 11:55:01 +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 4f4c646b92 update ssh login username 2018-08-24 12:08:54 +08:00
Jack Goh fd15a7e111 update gitlab cd host address 2018-08-24 11:39:05 +08:00
Jack Goh 5f94f54371 update storage permission error 2018-08-24 11:17:11 +08:00
Jack Goh 1450014e23 fix laravel.log permission 2018-08-24 11:09:26 +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 62ed955021 Merge branch 'minor-change/active-bank' into 'master' 
fix all user's booking in booking table to specifc user only

See merge request CIEFWorldwideSdnBhd/exchange!129
 2018-08-23 03:00:42 +00:00
Jack Goh 98732a6d62 fix all user's booking in booking table to specifc user only 2018-08-23 10:55:14 +08:00
Jack Goh 351e0ce467 Merge branch 'minor-change/active-bank' into 'master' 
added bank name label to active bank setting dropdown list

See merge request CIEFWorldwideSdnBhd/exchange!128
 2018-08-23 02:17:13 +00:00
Jack Goh 19ba992608 added bank name label to active bank setting dropdown list 2018-08-23 10:11:56 +08:00
Jack Goh 7472cac286 update MIT license to closed source license 2018-08-21 22:41:09 +08:00
Mohd Arief 8c3358c462 fixed conflict 2018-08-21 12:12:08 +08:00
Mohd Arief c3cd1d70ea fixed the View status button on admin completed order 2018-08-21 12:02:35 +08:00
Jack Goh 068cdb18e7 added back service charge 
updated change log
 2018-08-20 17:56:10 +08:00
Jack Goh 89890e93b3 Merge branch 'fix/bank-setting' into 'master' 
fix bank setting cannot be null error

See merge request CIEFWorldwideSdnBhd/exchange!126
 2018-08-20 09:37:19 +00:00
Jack Goh f15dbe44db fix bank setting cannot be null error 2018-08-20 17:31:25 +08:00
Jack Goh 9891d1fde1 Merge branch 'admin_Completed_Order' into 'master' 
Admin completed order

See merge request CIEFWorldwideSdnBhd/exchange!124
 2018-08-20 09:25:47 +00:00
Jack Goh 9a3bd8dade Merge branch 'fix/notification' into 'master' 
fix migration error

See merge request CIEFWorldwideSdnBhd/exchange!125
 2018-08-20 09:25:17 +00:00
Jack Goh b26727e5e6 fixed admin and user normal booking table with completed booking bug 2018-08-20 17:18:39 +08:00
lonetrinity a85b8eb41e fixBookingTable 2018-08-17 14:57:33 +08:00
lonetrinity 408be5d367 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order 2018-08-17 12:13:43 +08:00
Jack Goh 67cce6e91e Merge branch 'fix/refresh-button' into 'master' 
Fix/refresh button

See merge request CIEFWorldwideSdnBhd/exchange!123
 2018-08-17 03:33:18 +00: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
lonetrinity 249894d5b2 fixAdminCommit 2018-08-17 11:12:15 +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
lonetrinity 7d1155651b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order 2018-08-17 11:04:51 +08:00
lonetrinity 5db9908a57 prepare to merge 2018-08-17 11:04:44 +08:00