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
|
ede3af37c4
|
fixed moe issues
|
4 years ago |
umasoodch
|
938be5662d
|
fixed moe issues
|
4 years ago |
Sultan Khan
|
55f03d9971
|
MOE design updates
|
4 years ago |
Sultan Khan
|
3e99b36313
|
design changes
|
4 years ago |
umasoodch
|
215eec06b1
|
fix 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 |
enadhilal
|
91361f87d3
|
fixed worklist issue
|
4 years ago |
enadhilal
|
b42d72bd81
|
fixing search bar in my team
|
5 years ago |
enadhilal
|
a0ad116530
|
fixing My-Team and Hr-Request pages design
|
5 years ago |
haroon amjad
|
eb12d1672b
|
fixed ios issues
|
5 years ago |
Fatimah Alshammari
|
ca25bfb05a
|
resolved merge issues
|
5 years ago |
Fatimah Alshammari
|
4e6702dbf6
|
added new fonts
|
5 years ago |
Fatimah Alshammari
|
a6a6f17652
|
fixed testing issues
|
5 years ago |
Fatimah Alshammari
|
3080d0bb74
|
fixed merge issues
|
5 years ago |
Fatimah Alshammari
|
ab0f37ca12
|
fixed issues in mowdafi HR
|
5 years ago |
Fatimah Alshammari
|
bc3251b525
|
fixed my team design
|
5 years ago |
umasoodch
|
a813addd92
|
completed location for cloud solutions mohemm
|
5 years ago |
umasoodch
|
85b5416703
|
added backgroundgeo location
|
5 years ago |
Fatimah.Alshammari
|
694628bc5a
|
fix bugs
|
6 years ago |
Mohamed Mekawy
|
1d8ca3e0ec
|
Merge branch 'fatma-issu' of https://hmg.git.cloudforge.com/mohemmionic5 into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
4719af3b89
|
fix bugs
|
6 years ago |
umasoodch
|
79a79da53a
|
fixed issues
|
6 years ago |
Mohamed Mekawy
|
a928d525bc
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
9138bfe744
|
handle build --prod issue
|
6 years ago |
Mohamed Mekawy
|
41472e61a3
|
merge master-newdesign
|
6 years ago |
umasoodch
|
196ec6c9e9
|
Completed MM-212
|
6 years ago |
umasoodch
|
df50c472a0
|
Fixed MM-227
|
6 years ago |
Fatimah.Alshammari
|
d74b491dd9
|
Fix issu
|
6 years ago |
umasoodch
|
bcf8443157
|
fixed header issue in application
|
6 years ago |
Fatimah.Alshammari
|
0871a67480
|
all conflicting issues are resolved
|
6 years ago |
Fatimah.Alshammari
|
7a30805e71
|
add arabic version + fix bugs
|
6 years ago |
umasoodch
|
d26cea9024
|
fixed attendance and calendar issues
|
6 years ago |
Fatimah.Alshammari
|
25826f900d
|
header translate and quick walkthrouh to test design and translate
|
6 years ago |
umasoodch
|
f1157f48f6
|
fixed timecard module
|
6 years ago |
umasoodch
|
69ea2637d6
|
my-team attendance issues resolved
|
6 years ago |
umasoodch
|
7406d6f990
|
completed my-team except attendance one
|
6 years ago |
umasoodch
|
93e59d2618
|
added about data for team member
|
6 years ago |
umasoodch
|
6eeca7479d
|
my team new design componentes created
|
6 years ago |
ashwaq
|
8a4ab39623
|
fix infiniteScroll
|
6 years ago |
ashwaq
|
31a3b0a823
|
fix my team load more
|
6 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
7 years ago |
Sultan Khan
|
32b9ce319c
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/app.scss
# Mohem/src/app/home/home.page.scss
# Mohem/src/app/my-team/details/details.component.html
# Mohem/src/app/my-team/home/home.component.html
|
7 years ago |
Sultan Khan
|
10d9533c4b
|
css updates
|
7 years ago |
haroon amjad
|
e15574f1a2
|
style changes
|
7 years ago |
Sultan Khan
|
3327ad4d29
|
notification added
|
7 years ago |
Sultan Khan
|
628cc89189
|
absence page
|
7 years ago |
Sultan Khan
|
aee81e59ae
|
update
|
7 years ago |