cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
870 Commits 33 Branches 0 Tags
0bc668d6a474a3678fb474474c05eb526a10ef49
Commit Graph

870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh 0bc668d6a4 before merge 2018-09-18 11:11:14 +08:00
Jack Goh 37a95e6d05 added po format 2018-09-03 13:35:31 +08:00
Jack Goh 6b74883789 no message 2018-08-27 14:34:58 +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
Mohd Arief 424097e035 fixed the refresh button for completed order 2018-08-17 11:00:35 +08:00
Jack Goh 94d770bcba fix migration error 2018-08-17 10:55:40 +08:00
Jack Goh 02c393184c Merge branch 'fix/notification' into 'master' 
updated pusher to use environtment key

See merge request CIEFWorldwideSdnBhd/exchange!122
 2018-08-17 01:41:30 +00:00
Jack Goh 37a22322f4 updated pusher to use environtment key 2018-08-17 09:36:08 +08:00
Jack Goh 98d98a29c7 Merge branch 'fix/notification' into 'master' 
Fix/notification

See merge request CIEFWorldwideSdnBhd/exchange!121
 2018-08-16 09:58:11 +00:00
Jack Goh f7c0fdc690 fix test 2018-08-16 17:52:37 +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 330fd3336b added laravel-echo and pusher library to frontend 2018-08-16 11:00:46 +08:00
Jack Goh 2ad56b02a6 removed notification seeder 
updated boardcasting config
added rate updated notification file
 2018-08-16 10:58:54 +08:00
Jack Goh 2fff081268 remove notification 2018-08-16 10:23:52 +08:00
Jack Goh 5bc4f5929d removed all notifications code 2018-08-16 10:23:03 +08:00
Jack Goh e03dc2e562 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/notification 2018-08-16 10:12:20 +08:00
Jack Goh f6bd74ed5e removed unused code 2018-08-16 10:12:05 +08:00
Jack Goh 5671d1ceeb Merge branch 'fix/importer-notification' into 'master' 
fixed the notification bug on importer side

See merge request CIEFWorldwideSdnBhd/exchange!120
 2018-08-16 02:09:25 +00:00
Mohd Arief 117f2cdaee fixed the notification bug on importer side 2018-08-16 10:01:44 +08:00
Jack Goh 7bbe69638c fix unauthorized booking access 2018-08-16 09:52:40 +08:00
Jack Goh 232edde8e4 fix unauthorized booking access 2018-08-16 09:40:54 +08:00
Jack Goh df8c0312c9 Merge branch 'fix/bank-setting' into 'master' 
Fix/bank setting

See merge request CIEFWorldwideSdnBhd/exchange!119
 2018-08-15 09:41:51 +00:00