 omair saleh
|
74b363fb12
|
revert temp hide setting button
|
2022-02-24 12:45:51 +08:00 |
|
|
omair saleh
|
1212372515
|
temp hide setting button
|
2022-02-24 12:35:35 +08:00 |
|
 edmondlang
|
05b1aedda5
|
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
# app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
# app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
# app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
# app/Classes/Modules/Segments/Services/CreatesSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
# app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
# app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
# app/Http/Controllers/Announcements/ListAnnouncementsController.php
# app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Announcements/UpdateAnnouncementController.php
# app/Http/Controllers/Segments/CreateSegmentController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/api.php
# routes/segment.php
# routes/web.php
|
2022-02-09 21:09:17 +08:00 |
|
|
omair saleh
|
d8c767c670
|
Large commit
|
2021-08-16 08:59:43 +08:00 |
|
|
omair saleh
|
dfbfd04d31
|
registration ui fixes, and clean up header menu and footer
|
2021-08-02 12:08:30 +08:00 |
|
 weichien00
|
8b5dd24a14
|
update: integrate header,side menu to blade+vuejs.
|
2021-07-30 02:10:37 +08:00 |
|
|
weichien00
|
a2e16193aa
|
fix： resolve merge issue.
|
2021-07-23 23:44:29 +08:00 |
|