Commit Graph

137 Commits (8fb4f3ee49ac44aba1e36f075c9ef9d8d14e68ed)

Author SHA1 Message Date
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
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
umasoodch d1fbd34330 added logic for attendance 6 years ago
ashwaq 81504b0491 fix merge conflit 6 years ago
ashwaq 5df30f114b add attend-tracking 6 years ago
umasoodch a8f9640f68 added remaining services for dashboard 6 years ago
umasoodch 1c62b10486 merged master-newdesign with home branch and resolved all conflicts 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
ashwaq c069ae5282 Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into login 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
ashwaq ee7ac90c18 fix conflict 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 6 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 6 years ago
ashwaq 1db1a031ba fix conflict 6 years ago
ashwaq c52ee53b99 change profile Image 6 years ago
Mohamed Mekawy 2d03ed75f3 clean projest &will start phase 2 6 years ago
Mohamed Mekawy 2117526e5f my team enhancment 6 years ago
mohamed.mekawy 492eb5d912 edit Icon 7 years ago
mohamed.mekawy ce88e72248 solve bugs 7 years ago
Sultan Khan 75c28539a9 loader updated 7 years ago
haroon amjad 3b5da38b09 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/app-routing.module.ts
#	Mohem/src/assets/localization/i18n.json
7 years ago
ansariakhtar 5550730847 Code cleanup 7 years ago
haroon amjad debded96a0 Vacation Rule Continued 7 years ago
Sultan Khan fe7e62bbe6 home page update 7 years ago
ansariakhtar a787f6797d Login API 7 years ago
Sultan Khan 7a58598b2c forgot password page added 7 years ago
Sultan Khan 48a4360ac1 application skeleton 7 years ago