Commit Graph

78 Commits (ee4e36d9fce7f6f43d67837008f541e89a3fbe73)

Author SHA1 Message Date
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
Fatimah.Alshammari 573941941f edit monthly attendance 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
umasoodch 7406d6f990 completed my-team except attendance one 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 838e7cf99b add worklist+ fix conflict 6 years ago
ashwaq eb9413edb9 add worklist fix conflict 6 years ago
ashwaq ece6e45d97 add worklist new design 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
enadhilal 2f55272c91 new-time-card 6 years ago
enadhilal f3fdc1454f monthly-attendance design 6 years ago
umasoodch e629aab07a merged and fixed all the conflicting issues and also removed unnecessary code 6 years ago
umasoodch 2e6dd95004 completed work list ui part 6 years ago
umasoodch f7002f3eae completed dashboard and attendance timer work 6 years ago
umasoodch dcf6bd5d79 no message 6 years ago
umasoodch 884e518971 Merge branch 'master-newdesign' into home
# Conflicts:
#	Mohem/src/app/hmg-common/hmg-common.module.ts
6 years ago