umasoodch
118c9326ce
fixed default icon issue
3 years ago
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
4 years ago
umasoodch
a35ffbd5bd
fixed moe issues
4 years ago
umasoodch
e4019c5608
IMPLEMENTED NEW DEV FOR MOE
4 years ago
umasoodch
96630d6606
fixed moe issues
4 years ago
umasoodch
5c3ac9be4d
fixed image issue
4 years ago
umasoodch
ede3af37c4
fixed moe issues
4 years ago
umasoodch
33affad3bf
fixed moe issues
4 years ago
umasoodch
adb4aaae4d
fixed moe issues
4 years ago
umasoodch
5020860449
fixed moe issues
4 years ago
umasoodch
b071e0f5b1
changed MOE colors
4 years ago
umasoodch
ae5bc591eb
fixed moe issues
4 years ago
Sultan Khan
be1e5cf6fc
MOE design updates
4 years ago
umasoodch
24cc77e7f3
commented favourites
4 years ago
umasoodch
aadbc24ba1
fixed srca issues
4 years ago
Sultan Khan
80dd2817df
MOE changes
4 years ago
umasoodch
c7a664eccf
fixed srca css issues
4 years ago
umasoodch
b7e6ad0ffb
fixed css issues
4 years ago
umasoodch
43ae0ac794
pushed
4 years ago
umasoodch
fc0179e1eb
fixed moe issues
4 years ago
umasoodch
4b140eecc0
fixed issues for SRCA
4 years ago
umasoodch
00a2eb881d
changed MOE design
4 years ago
umasoodch
cd910f4bdc
fixed mohemm IC issues
4 years ago
umasoodch
fa7685c57a
fixed concurrent report issue and added new icon
4 years ago
umasoodch
bddfd20f16
removed unused image
4 years ago
umasoodch
e87da5e2fd
fixed all issues
4 years ago
enadhilal
1d1c6f6581
add answer icon to itg
4 years ago
Sultan Khan
1be3babe65
Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live
4 years ago
Sultan Khan
1f958c4fa7
bug fixes
4 years ago
enadhilal
490c525e08
add translation for validation text
4 years ago
umasoodch
46ea45bbb0
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
4 years ago
Sultan Khan
3529b60ebc
Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live
4 years ago
Sultan Khan
96cf60fecf
q3 bug fixes change updates
4 years ago
enadhilal
fe5f41e89e
fixed bug# 687
...
added toasts MSG for survey and video erm
fixed fav for ITG
added new icons for action btn in ITG
4 years ago
umasoodch
7c175386eb
fixed buttons issue
4 years ago
enadhilal
c10590d58a
change itg icons
4 years ago
enadhilal
a048198f89
fixed fav in worklist design and added icon for doable and not doable
4 years ago
Sultan Khan
1313602ab3
q3 changes updates
4 years ago
umasoodch
124836aa25
fixed fav issue
4 years ago
enadhilal
f597f56f00
stamp next is not working
...
success message should be
"Your action has been executed successfully!"
if in case while approve reject delegate service gives error it should not move to next one
4 years ago
Sultan Khan
5e21b1178b
Merge branch 'MOHEMM-Q3-DEV-LATEST' of https://gitlab.com/haroon6138/mohemmionic5 into sultan-q3
4 years ago
Sultan Khan
b826abff73
arabic version fixes
4 years ago
umasoodch
744740ac44
Merge branch 'MOHEMM-Q3-DEV-LATEST' into enad-pre-live
...
# Conflicts:
# Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
# Mohem/src/app/eit/cei-homepage/cei-homepage.component.ts
4 years ago
umasoodch
ef73fc8bc3
fixed child education
4 years ago
enadhilal
e306628867
added validation in change password and redsign CEI component
4 years ago
enadhilal
91361f87d3
fixed worklist issue
4 years ago
Sultan Khan
b3ae4c96f7
contact
4 years ago