umasoodch
|
7862926f11
|
Merge branch 'MOE_MAIN-COLOR_CHANGES' into SRCA_DEV_NEW
# Conflicts:
# Mohem/GoogleService-Info.plist
# Mohem/config.xml
# Mohem/google-services.json
# Mohem/resources/android/icon/drawable-hdpi-icon.png
# Mohem/resources/android/icon/drawable-ldpi-icon.png
# Mohem/resources/android/icon/drawable-mdpi-icon.png
# Mohem/resources/android/icon/drawable-xhdpi-icon.png
# Mohem/resources/android/icon/drawable-xxhdpi-icon.png
# Mohem/resources/android/icon/drawable-xxxhdpi-icon.png
# Mohem/resources/android/splash/drawable-land-hdpi-screen.png
# Mohem/resources/android/splash/drawable-land-ldpi-screen.png
# Mohem/resources/android/splash/drawable-land-mdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xhdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png
# Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-hdpi-screen.png
# Mohem/resources/android/splash/drawable-port-ldpi-screen.png
# Mohem/resources/android/splash/drawable-port-mdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png
# Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png
# Mohem/resources/icon.png
# Mohem/resources/splash.png
# Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
# Mohem/src/app/absence/home/home.component.html
# Mohem/src/app/absence/home/home.component.scss
# Mohem/src/app/absence/home/home.component.ts
# Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss
# Mohem/src/app/absence/submit-absence/submit-absence.component.scss
# Mohem/src/app/absence/view-attachments/view-attachments.component.scss
# Mohem/src/app/app.component.html
# Mohem/src/app/app.component.scss
# Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html
# Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss
# Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts
# Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
# Mohem/src/app/authentication/login/login.component.scss
# Mohem/src/app/eit/add-cei/add-cei.component.scss
# Mohem/src/app/eit/add-eit/add-eit.component.scss
# Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
# Mohem/src/app/eit/cei-list/cei-list.component.html
# Mohem/src/app/eit/cei-list/cei-list.component.scss
# Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
# Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
# Mohem/src/app/eit/eit-list/eit-list.component.html
# Mohem/src/app/eit/eit-list/eit-list.component.scss
# Mohem/src/app/eit/eit-list/eit-list.component.ts
# Mohem/src/app/eit/eit-update-list/eit-update-list.component.html
# Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss
# Mohem/src/app/eit/home/home.component.scss
# Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss
# Mohem/src/app/hmg-common/services/connector/connector.service.ts
# Mohem/src/app/hmg-common/ui/card-calendar/card-calendar.component.html
# Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
# Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss
# Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts
# Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
# Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss
# Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss
# Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss
# Mohem/src/app/home/home.page.scss
# Mohem/src/app/home/home.page.ts
# Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss
# Mohem/src/app/mowadhafi/hr-request/hr-request.component.scss
# Mohem/src/app/mowadhafi/request-details/request-details.component.scss
# Mohem/src/app/my-team/details/details.component.scss
# Mohem/src/app/my-team/details/details.component.ts
# Mohem/src/app/my-team/home/home.component.scss
# Mohem/src/app/my-team/home/home.component.ts
# Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/app/notification/home/home.component.scss
# Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
# Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
# Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss
# Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
# Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
# Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss
# Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss
# Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
# Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss
# Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss
# Mohem/src/app/notification/worklist-main/worklist-main.component.html
# Mohem/src/app/notification/worklist-main/worklist-main.component.scss
# Mohem/src/app/notification/worklist-setting/worklist-setting.component.scss
# Mohem/src/app/payslip/home/home.component.scss
# Mohem/src/app/payslip/home/home.component.ts
# Mohem/src/app/profile/add-address/add-address.component.scss
# Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
# Mohem/src/app/profile/confirm-address/confirm-address.component.scss
# Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
# Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
# Mohem/src/app/profile/contact/contact.component.html
# Mohem/src/app/profile/edit-profile/edit-profile.component.scss
# Mohem/src/app/profile/home/home.component.html
# Mohem/src/app/profile/home/home.component.scss
# Mohem/src/app/profile/home/home.component.ts
# Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
# Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts
# Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
# Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
# Mohem/src/app/profile/profile-image/profile-image.component.scss
# Mohem/src/app/profile/submit-eit-modal/submit-address-modal.component.scss
# Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss
# Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
# Mohem/src/app/time-card/time-card-details/time-card-details.component.ts
# Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg
# Mohem/src/assets/imgs/profile-icons/info-a@2x.svg
# Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg
# Mohem/src/assets/localization/i18n.json
# Mohem/src/theme/styles.scss
# Mohem/src/theme/variables.scss
|
3 years ago |
umasoodch
|
28846867df
|
fixed moe issues
|
3 years ago |
umasoodch
|
191c8e6b50
|
fixed resources for android app
|
3 years ago |
umasoodch
|
c79f494d44
|
fixed moe issues
|
3 years ago |
Sultan Khan
|
82a85cd2c2
|
design updated
|
3 years ago |
umasoodch
|
0481a42907
|
changed resources
|
3 years ago |
umasoodch
|
ef62c8fae7
|
added splash icon and firebase files in srca project
|
3 years ago |
Sultan Khan
|
5b2eb00f1a
|
android images fixed
|
4 years ago |
Sultan Khan
|
918d30f04b
|
item for sale q3
|
4 years ago |
umasoodch
|
c6ee3e798c
|
fixed worklist and icon issue. Also removed unused plugins.
|
5 years ago |
umasoodch
|
3e6e2a9353
|
changed splash for CS
|
5 years ago |
umasoodch
|
85b5416703
|
added backgroundgeo location
|
5 years ago |
Salman Afzal
|
f96c443d2d
|
fixed structural issues and deler unused files
|
6 years ago |
umasoodch
|
338205b305
|
Removed onw signal and added firebasex plugin
|
6 years ago |
Mohamed Mekawy
|
2d03ed75f3
|
clean projest &will start phase 2
|
6 years ago |
mohamed.mekawy
|
ad56814966
|
fix notification & home
|
6 years ago |
haroon amjad
|
9b35e22a98
|
new Al Habib Mohemm App
|
6 years ago |
haroon amjad
|
7288c37bcb
|
no message
|
6 years ago |
haroon amjad
|
e15574f1a2
|
style changes
|
7 years ago |
ansariakhtar
|
66e33ed55f
|
Attendance
|
7 years ago |