umasoodch
|
5784bead37
|
fixed prod issues
|
6 years ago |
Mohamed Mekawy
|
91b619c1b1
|
merge master-newdesign
|
6 years ago |
Fatimah.Alshammari
|
694628bc5a
|
fix bugs
|
6 years ago |
umasoodch
|
06226c89e7
|
fixed issues
|
6 years ago |
Mohamed Mekawy
|
d76ed8aa0d
|
merge master-newdesign
|
6 years ago |
ashwaq
|
77cabbea57
|
fix conflict with new design
|
6 years ago |
ashwaq
|
5d978fa175
|
fix bugs
|
6 years ago |
umasoodch
|
7e9e1209ea
|
fixed shift details
|
6 years ago |
umasoodch
|
5538076b13
|
fixed merging conflicts
|
6 years ago |
Mohamed Mekawy
|
68fff95219
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
997b7d3a88
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
4deaf4dc38
|
fix bugs
|
6 years ago |
Fatimah.Alshammari
|
bd0208919c
|
fix bugs
|
6 years ago |
ashwaq
|
30ba667bb4
|
fix VR select , txt confirm, type last login
|
6 years ago |
umasoodch
|
06f7cfa0fa
|
MM-280
MM-160
MM-202
|
6 years ago |
enadhilal
|
0d83f70fde
|
fixing rememberMy and remove user name and password text when click athor user
|
6 years ago |
umasoodch
|
df9a283100
|
fixed conflicts
|
6 years ago |
umasoodch
|
bcf8443157
|
fixed header issue in application
|
6 years ago |
Mohamed Mekawy
|
7d8927c1cf
|
merge master-newdesign
|
6 years ago |
Fatimah.Alshammari
|
35781357d3
|
merge master-newdesign
|
6 years ago |
umasoodch
|
d31b76bc44
|
fixed all issues while making prod build
|
6 years ago |
umasoodch
|
bf317e7274
|
fixed merged issues with master-newdesign
|
6 years ago |
umasoodch
|
6db87b6930
|
fixed issue MM-46
|
6 years ago |
umasoodch
|
b3fae94a1c
|
MM-96
MM-95 issues fixed
|
6 years ago |
Fatimah.Alshammari
|
a18c30eaa5
|
general enhancments
|
6 years ago |
umasoodch
|
cb67e2670a
|
issues resolved
|
6 years ago |
umasoodch
|
d6dc300cf6
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
Fatimah.Alshammari
|
0052bb98ff
|
merge master-newdesign
|
6 years ago |
ashwaq
|
9d4bd2f592
|
fix login conflict
|
6 years ago |
ashwaq
|
14e2654ae4
|
fix login
|
6 years ago |
Fatimah.Alshammari
|
0871a67480
|
all conflicting issues are resolved
|
6 years ago |
Fatimah.Alshammari
|
80ab9a5c80
|
general
|
6 years ago |
umasoodch
|
b9f22f4eef
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
68357f35b2
|
fixed worklist flow
|
6 years ago |
Fatimah.Alshammari
|
7a30805e71
|
add arabic version + fix bugs
|
6 years ago |
umasoodch
|
d26cea9024
|
fixed attendance and calendar issues
|
6 years ago |
umasoodch
|
536e8a9c5a
|
handled multiple shifts and added slider.
|
6 years ago |
Fatimah.Alshammari
|
25826f900d
|
header translate and quick walkthrouh to test design and translate
|
6 years ago |
Mohamed Mekawy
|
0928d55171
|
edit home last login way
|
6 years ago |
Mohamed Mekawy
|
024ed04baf
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
ae3a2e4995
|
merge master-newdesign
|
6 years ago |
umasoodch
|
f1157f48f6
|
fixed timecard module
|
6 years ago |
Mohamed Mekawy
|
1f044cfb3e
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
561db9109f
|
Merge branch 'master-newdesign' into myteam
# Conflicts:
# Mohem/package-lock.json
# Mohem/package.json
# Mohem/src/app/eit/home/home.component.html
# Mohem/src/app/hmg-common/hmg-common.module.ts
# Mohem/src/app/home/home.page.ts
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/theme/styles.scss
|
6 years ago |
ashwaq
|
e7e9ec7b63
|
fix conflict
|
6 years ago |
ashwaq
|
527ee02627
|
add get login last info
|
6 years ago |
umasoodch
|
69ea2637d6
|
my-team attendance issues resolved
|
6 years ago |
Mohamed Mekawy
|
a694396f82
|
add click to status button & add icon to service buttons & fix issues
|
6 years ago |
ashwaq
|
18dabcb13e
|
add vacation rule
|
6 years ago |
umasoodch
|
55f5b391e1
|
Merge branch 'new-time-card' into myteam
|
6 years ago |