Commit Graph

87 Commits

Author SHA1 Message Date
Omair Saleh 022d99875a large commit 2019-05-27 09:46:49 +08:00
Omair Saleh 43a9e0ca03 large commit 2019-05-18 12:14:31 +08:00
Omair Saleh bfcbe76049 change maintenance mode page 2019-04-24 01:24:09 +08:00
Omair Saleh a1433c9f9a change maintenance mode page 2019-04-24 01:22:02 +08:00
Omair Saleh 1ab4d00d21 change maintenance mode page 2019-04-24 01:08:46 +08:00
Omair Saleh 3d28a09da1 change maintenance mode page 2019-04-24 00:20:01 +08:00
Omair Saleh 1bf20f8417 Merge remote-tracking branch 'origin/master' 2019-04-24 00:01:02 +08:00
Omair Saleh 2d41eee948 change maintenance mode page 2019-04-24 00:00:42 +08:00
Kawlll Maxso 38d67d4139 fix for modal not close 2019-04-22 15:36:55 +08:00
Kawlll Maxso a1c5087b9c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim into notificatio
# Conflicts:
#	app/Classes/Modules/Orders/Services/ListsOrderHistory.php
2019-04-22 11:00:04 +08:00
Kawlll Maxso 6686451d73 Notification 2019-04-22 10:22:07 +08:00
omair saleh cd462b777c Update ShippingStepComponenet.vue 2019-04-16 03:43:39 +00:00
ayen ac4cae37ca Update ShippingStepComponenet.vue. fixing datepicker validation month logic 2019-04-16 03:12:41 +00:00
Omair Saleh bf40f0975f minor changes 2019-04-12 23:34:19 +08:00
Omair Saleh 3d1cc5f38d minor changes 2019-04-12 23:31:54 +08:00
Omair Saleh 241f4e43e2 minor changes 2019-04-12 23:00:08 +08:00
Omair Saleh 8241a4c37c minor changes 2019-04-12 22:49:57 +08:00
Omair Saleh 6f8876e552 minor changes 2019-04-12 22:45:07 +08:00
Omair Saleh 243990d228 large changes 2019-04-12 22:21:43 +08:00
omair saleh d7370679ac Merge branch 'IZYIM-14' into 'master'
Izyim 14

See merge request CIEFWorldwideSdnBhd/izyim!17
2019-04-12 14:13:50 +00:00
Omair Saleh a7cb7b5eb6 large changes 2019-04-12 18:25:22 +08:00
Kawlll Maxso a20caf4e56 Git date etd eta and validation 2019-04-11 15:52:20 +08:00
Kawlll Maxso 0b30300706 Git date etd eta and validation 2019-04-10 12:09:32 +08:00
Omair Saleh 9a8634547b large changes 2019-04-07 19:42:27 +08:00
hazim d5353caeff Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim into order-search 2019-04-02 11:35:48 +08:00
hazim 19cd568a42 Search Order Component 2019-04-02 11:33:33 +08:00
hazim 74fea496a7 Search Order Component 2019-04-02 11:30:32 +08:00
omair saleh 4581e3875a Merge branch 'order-search' into 'master'
Search Order Component

See merge request CIEFWorldwideSdnBhd/izyim!15
2019-04-02 02:36:20 +00:00
hazim fb92d1ba16 Search Order Component 2019-04-02 10:31:33 +08:00
omair saleh eb61cc8ca7 Merge branch 'master' into 'changePassword'
# Conflicts:
#   routes/web.php
2019-04-02 01:53:30 +00:00
omair saleh c4f0f30fe7 Merge branch 'order-search' into 'master'
Search & Filter Orders

See merge request CIEFWorldwideSdnBhd/izyim!13
2019-03-28 08:49:08 +00:00
hazim 99d9cc9c4a Search & Filter Orders 2019-03-28 16:31:15 +08:00
Kawlll Maxso 4f36e4909a Forgot and change password 2019-03-28 16:16:28 +08:00
Kawlll Maxso 212f6131fd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim into changePassword 2019-03-25 16:49:51 +08:00
Kawlll Maxso 0eda89eb26 Forgot and change password 2019-03-25 16:03:01 +08:00
Omair Saleh 118ba705db large changes`` 2019-03-25 14:54:19 +08:00
Omair Saleh 1fbc3f269f large changes 2019-03-25 14:45:23 +08:00
Omair Saleh 3c3fe56910 large changes 2019-03-25 14:43:10 +08:00
Kawlll Maxso 9ffc58f541 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim into forgotPassword 2019-03-22 10:07:32 +08:00
Kawlll Maxso 9d5015aef2 Forgot Account 2019-03-22 10:05:07 +08:00
omair saleh 8bcac8fe1c Merge branch 'dashboardFixed-2' into 'master'
Dashboard cleanup

See merge request CIEFWorldwideSdnBhd/izyim!11
2019-03-21 02:01:31 +00:00
Kawlll Maxso e1ec1db1b0 Dashboard report 2019-03-20 19:30:35 +08:00
omair saleh 104fc1b7c8 Merge branch 'Account' into 'master'
user invitations fix

See merge request CIEFWorldwideSdnBhd/izyim!10
2019-03-20 10:37:14 +00:00
hazim 2b8e3ba455 user invitations fix 2019-03-20 18:33:34 +08:00
omair saleh bcc5e6733e Merge branch 'Account' into 'master'
user invitations fix

See merge request CIEFWorldwideSdnBhd/izyim!9
2019-03-20 10:23:59 +00:00
hazim 9ccc9617a2 user invitations fix 2019-03-20 18:18:06 +08:00
omair saleh 5d54dcfccf Merge branch 'dashboardReportFixed' into 'master'
Dashboard report

See merge request CIEFWorldwideSdnBhd/izyim!7
2019-03-19 10:58:26 +00:00
hazim 10d17260a3 datepicker for order 2019-03-19 18:52:42 +08:00
Kawlll Maxso ac1353c5a1 Dashboard report 2019-03-19 18:45:39 +08:00
omair saleh 8a28eb1790 Revert "Merge branch 'dashboardReport' into 'master'"
This reverts merge request !5
2019-03-19 09:57:38 +00:00