Commit Graph

88 Commits

Author SHA1 Message Date
mhmj bb60cbf67d Receive-Note-BackEnd 2019-05-28 15:56:46 +08:00
mhmj 862ced7efe Receive-Note-BackEnd 2019-05-28 10:21:59 +08:00
Omair Saleh 2546b4a7fa large commit 2019-05-27 10:41:51 +08:00
omair saleh f961cc9b31 Merge branch 'Cleaned-BackEnd-Warehouse' into 'master'
Cleann Back-End Warehouse

See merge request CIEFWorldwideSdnBhd/izyim!25
2019-05-27 01:54:43 +00:00
Omair Saleh 5f44e096ac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Http/Controllers/Companies/CompanyController.php
#	routes/api.php
2019-05-27 09:49:01 +08:00
Omair Saleh 022d99875a large commit 2019-05-27 09:46:49 +08:00
mhmj 4ff0c448c6 Cleann Back-End Warehouse 2019-05-23 14:35:14 +08:00
omair saleh a276c8982f Merge branch 'Cleaned-BackEnd-Contact' into 'master'
Cleaned back end contact

See merge request CIEFWorldwideSdnBhd/izyim!24
2019-05-21 08:51:18 +00:00
omair saleh d39fe71a3b Merge branch 'Cleaned-BackEnd-Companies' into 'master'
Cleaned-BackEnd-Companies-AddressBook

See merge request CIEFWorldwideSdnBhd/izyim!23
2019-05-21 08:51:10 +00:00
Omair Saleh 43a9e0ca03 large commit 2019-05-18 12:14:31 +08:00
hazim 1e751ecc32 Cleaned-BackEnd-Contact 2019-05-09 12:26:14 +08:00
hazim 039827f0c9 Cleaned-BackEnd-Companies-AddressBook 2019-05-08 11:31:00 +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
hazim 266d737c90 Omair's order history list 2019-04-16 11:38:03 +08:00
Omair Saleh 2e266b6e5d minor changes 2019-04-16 11:25:16 +08:00
Omair Saleh b1d927b0c7 minor changes 2019-04-16 11:05:20 +08:00
Omair Saleh b6e852e190 minor changes 2019-04-12 22:39:26 +08:00
Omair Saleh c564639ff5 minor changes 2019-04-12 22:33:14 +08:00
Omair Saleh 7cfc6126b1 large changes 2019-04-12 22:20:22 +08:00
Omair Saleh fd2f6f2329 large changes 2019-04-12 22:19:26 +08:00
Omair Saleh 074404ad16 Merge remote-tracking branch 'origin/master' 2019-04-12 22:17:10 +08:00
Omair Saleh 55f7ce9c24 large changes 2019-04-12 22:16:53 +08:00
omair saleh bc8b3d093f Merge branch 'IZYIM-38' into 'master'
Izyim 38 order status

See merge request CIEFWorldwideSdnBhd/izyim!18
2019-04-12 14:14:09 +00:00
Kawlll Maxso a85b04e441 Order status bug 2019-04-12 19:25:20 +08:00
Kawlll Maxso 371aa3e4f8 Git date etd eta and validation 2019-04-12 19:23:21 +08:00
Omair Saleh 9d3eb5e8b9 large changes 2019-04-12 18:28:30 +08:00
Omair Saleh a7cb7b5eb6 large changes 2019-04-12 18:25:22 +08:00
omair saleh eb61cc8ca7 Merge branch 'master' into 'changePassword'
# Conflicts:
#   routes/web.php
2019-04-02 01:53:30 +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 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 c024bd7649 large changes 2019-03-21 11:53:04 +08:00
Omair Saleh 2b991e0990 large changes 2019-03-21 11:39:43 +08:00
Omair Saleh 07d3b82805 large changes 2019-03-21 11:33:19 +08:00
Omair Saleh 633430dccc large changes 2019-03-21 11:31:37 +08:00
omair saleh 414cbf80be Merge branch 'dashboard-3' into 'master'
Omair salih dasherboared

See merge request CIEFWorldwideSdnBhd/izyim!12
2019-03-21 03:19:49 +00:00
Kawlll Maxso 8af6a5cca6 Dashboard report 2019-03-21 11:02:19 +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
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
omair saleh c6ca0a7816 Merge branch 'Account' into 'master'
Account - active & invite user

See merge request CIEFWorldwideSdnBhd/izyim!4
2019-03-19 09:44:45 +00:00
Kawlll Maxso 863bf0a82f Dashboard report 2019-03-19 17:11:21 +08:00
hazim a25073f06f Account - active & invite user 2019-03-19 10:22:04 +08:00
Omair Saleh 037f3749ee large changes 2019-03-13 16:52:06 +08:00
Omair Saleh 34725c82ca large changes 2019-03-12 12:39:13 +08:00
Omair Saleh 1b2443d5f2 large changes 2019-03-12 12:17:41 +08:00
omair saleh 496e1ff7e3 Merge branch 'Contact-Cleanup' into 'master'
Contact cleanup

See merge request CIEFWorldwideSdnBhd/izyim!2
2019-03-11 10:37:35 +00:00