umasoodch
|
dd95c5feb3
|
fixed merge issues
|
3 years ago |
umasoodch
|
3f8c8a7a07
|
fixed srca issues
|
3 years ago |
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
|
0b9738e4b5
|
fixed moe issues
|
3 years ago |
umasoodch
|
ef2cf3aa3f
|
fixed mohemm moe issues
|
3 years ago |
Sultan khan
|
1ca8e60b05
|
fixed welcome page issue
|
3 years ago |
Sultan khan
|
1999f8eb60
|
fixed language issue
|
3 years ago |
umasoodch
|
bcb0355703
|
fixed language issue
|
3 years ago |
umasoodch
|
8e882b2de8
|
fixed language issue
|
3 years ago |
umasoodch
|
932deb613b
|
fixed all ui changes
|
3 years ago |
umasoodch
|
5020860449
|
fixed moe issues
|
3 years ago |
umasoodch
|
06e5005355
|
fixed fingerprint name
|
3 years ago |
umasoodch
|
c79f494d44
|
fixed moe issues
|
3 years ago |
umasoodch
|
5d99bae7fb
|
fixed moe issues
|
3 years ago |
Sultan Khan
|
82a85cd2c2
|
design updated
|
3 years ago |
Sultan Khan
|
55f03d9971
|
MOE design updates
|
4 years ago |
umasoodch
|
057e28bf16
|
Merge branch 'MOE_DEV_NEW_TEMPORARY_DESIGN' of https://gitlab.com/haroon6138/mohemmionic5 into MOE_DEV_NEW_TEMPORARY_DESIGN
|
4 years ago |
umasoodch
|
7bec818989
|
removed whatsapp
|
4 years ago |
Sultan Khan
|
3e99b36313
|
design changes
|
4 years ago |
umasoodch
|
fb4cf0ab56
|
fixed plugin name issue
|
4 years ago |
Sultan Khan
|
a7d2202897
|
CSS changes
|
4 years ago |
umasoodch
|
aadbc24ba1
|
fixed srca issues
|
4 years ago |
umasoodch
|
b7e6ad0ffb
|
fixed css issues
|
4 years ago |
Sultan Khan
|
a78efed0d1
|
fixed moe css issues
|
4 years ago |
umasoodch
|
00a2eb881d
|
changed MOE design
|
4 years ago |
Sultan Khan
|
c6660fb925
|
SCRA colors changes
|
4 years ago |
Sultan Khan
|
bec7b24621
|
MOE changes "commented functionalities "
|
4 years ago |
Sultan Khan
|
a2f7c869cd
|
Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into MOE_DEV
|
4 years ago |
Sultan Khan
|
505426e42f
|
bug fixes
|
4 years ago |
umasoodch
|
829267e897
|
removed forgot password
|
4 years ago |
umasoodch
|
cd910f4bdc
|
fixed mohemm IC issues
|
4 years ago |
haroon amjad
|
fa367db510
|
fixed ios issue for sms message
|
4 years ago |
umasoodch
|
d9cc9db7c7
|
fixed loading issue
|
4 years ago |
umasoodch
|
e87da5e2fd
|
fixed all issues
|
4 years ago |
Sultan Khan
|
cd6ef408cc
|
Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live
|
4 years ago |
enadhilal
|
a57ed5fd01
|
fixing bugs
|
4 years ago |
Sultan Khan
|
2a6f520d2b
|
bug fixes
|
4 years ago |
enadhilal
|
b60fd8be8a
|
fixed bugs #:
MM-742
MM-743
and added show my password in forgot password and change password
|
4 years ago |
enadhilal
|
490c525e08
|
add translation for validation text
|
4 years ago |
enadhilal
|
a3057b0126
|
no message
|
4 years ago |
enadhilal
|
f8b9e47696
|
add pre-wrap to all text validation
|
4 years ago |
enadhilal
|
c58be5d885
|
no message
|
4 years ago |
enadhilal
|
c28509c804
|
validation in forgot password and change password
|
4 years ago |
enadhilal
|
a6bfcbdd77
|
business card desined fixed, worklist IC requests approve and reject buttons fixed.
|
4 years ago |
umasoodch
|
1fd51782d4
|
fixed prod issue
|
4 years ago |
umasoodch
|
6f4ba1741e
|
Merge branch 'MOHEMM-Q3-DEV-LATEST' into sultan-q3
|
4 years ago |
Sultan Khan
|
1313602ab3
|
q3 changes updates
|
4 years ago |
umasoodch
|
5609d85853
|
fixed xacta report issue
|
4 years ago |
Sultan Khan
|
2567bc2c8b
|
updated auto sms
|
4 years ago |
Sultan Khan
|
7968b3e4ad
|
Merge branch 'sultan-q3' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
|
4 years ago |