Commit Graph

280 Commits (5ae2c2f170977e7f5834c7224f4e9abead0cd82a)

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
Mohamed Mekawy 25799a7c78 merge master-newdesign 6 years ago
Mohamed Mekawy e191b21e44 fix issues 6 years ago
ashwaq d4ef8bf7ec fix po attachment + Mo Action 6 years ago
Fatimah.Alshammari 35781357d3 merge master-newdesign 6 years ago
umasoodch d31b76bc44 fixed all issues while making prod build 6 years ago
ashwaq c7eb6c97a2 fix merge ashwaq issue + work-list branch 6 years ago
ashwaq a0e265ba55 fix merge 6 years ago
ashwaq 18f54941ee fix update/continue notification + action name 6 years ago
umasoodch 270506a31c fixed multiple popup issues 6 years ago
umasoodch bf317e7274 fixed merged issues with master-newdesign 6 years ago
umasoodch e7d476fc2e fixed MM-139 MM-134 MM-123 MM-47 6 years ago
umasoodch 6db87b6930 fixed issue MM-46 6 years ago
ashwaq 5aeab4b08c add MO item History 6 years ago
umasoodch b3fae94a1c MM-96
MM-95 issues fixed
6 years ago
Mohamed Mekawy 0c0cffb75e edit payslip 6 years ago
ashwaq 2397fc1482 fix bug 6 years ago
umasoodch ab2ace51b9 MM-112 FIXED - worklist and home loader issue resolved 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
Mohamed Mekawy 289e5f1452 enhance login 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 afed126eaf edit my team icon 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
Mohamed Mekawy 5d41967ed7 edit login token 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 05ea5e349f fixed tslint issues 6 years ago
enadhilal a3109bc0a8 create and design ITG form 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 a78477c192 fixed attendance tracking issue 6 years ago
umasoodch a9128c93e2 completed my-team 6 years ago
umasoodch 4bf4d4fc24 fixed merging conflicts 6 years ago
enadhilal b27f976bc9 push to merge with worklist work 6 years ago
umasoodch 7406d6f990 completed my-team except attendance one 6 years ago
Fatimah.Alshammari 2a71811ca2 edit monthley attendance 6 years ago
ashwaq 93f973022c fix conflict 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
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
Mohamed Mekawy f316629cb0 merge master-newdesign branch 6 years ago
Fatimah.Alshammari afc8c99639 add new design to payslip 6 years ago
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 6 years ago
enadhilal a2acf0dcbd update monthly-attendance 6 years ago
Mohamed Mekawy a09bac4b6e Merge remote-tracking branch 'origin/timecard' into new-time-card 6 years ago
Fatimah.Alshammari b9e1a95601 Add new profile page & years of experience & Performance appraisal 6 years ago
enadhilal f3fdc1454f monthly-attendance design 6 years ago
umasoodch d2fac5c4d5 added header for worklist 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 ecbdf62c74 merged and resolved conflicts 6 years ago
umasoodch dcf6bd5d79 no message 6 years ago
ashwaq 4fe49bdb18 add attend scan service + fix design alert 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 ab30d50808 Merge branch 'master-newdesign' into side-menu 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
ashwaq 7779a2ed61 fix conflict 6 years ago
ashwaq e6642a29e8 fix conflit 6 years ago
Mohamed Mekawy 213648a9ed Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into Dashbored 6 years ago
ashwaq 335758fbd0 add login design 6 years ago
umasoodch 338205b305 Removed onw signal and added firebasex plugin 6 years ago
umasoodch 5c7a30f308 added firebase token instead of one signal 6 years ago
Fatimah.Alshammari 13df9b7b75 add dachboard services 6 years ago
Fatimah.Alshammari d5407c8f90 add dachboard services 6 years ago
ashwaq 7456ab6e0a add dashbored services 6 years ago
ashwaq 4bdc08b42d add dashbored 6 years ago
umasoodch e01c73a092 completed functionality of time card module 6 years ago
umasoodch 167973cedb added time card detail and its summary 6 years ago
ashwaq ee7ac90c18 fix conflict 6 years ago
ashwaq b02743ead1 PO+MO+PR+Payslip+customAccordin 6 years ago
Mohamed Mekawy ba0d53011b Add Time card & Edit date element & change icons 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
Mohamed Mekawy e59db729a7 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
Mohamed Mekawy 6d99285451 handle build error by removin backgroud location plugin 6 years ago
ashwaq 524b29193a Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq d09d251c71 PR Worklist 6 years ago
enadhilal 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago
ashwaq 8cc0a3fff7 fix device token issue 6 years ago
ashwaq 2a75920565 Confirm Login by SMS,Whatsapp,fingerprint and faceID 6 years ago
ashwaq 53fe3813b0 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 6 years ago
ashwaq 061c740c55 Add payslip + Fix vacation rule 6 years ago
Mohamed Mekawy 7046c7fa43 edit my team & erp issues 6 years ago
Mohamed Mekawy 17246a58b8 add PO & MO & PR 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 ad56814966 fix notification & home 6 years ago
mohamed.mekawy 492eb5d912 edit Icon 6 years ago
haroon amjad 9b35e22a98 new Al Habib Mohemm App 6 years ago
mohamed.mekawy ce88e72248 solve bugs 6 years ago
haroon amjad 8915e67b00 fixes 7 years ago
haroon amjad e15574f1a2 style changes 7 years ago
Sultan Khan f21be03b02 specialist page update 7 years ago
haroon amjad 22a11a3214 My Subordinate Page implemented 7 years ago
haroon amjad 7af8b9c791 My Specialist Page Implemented 7 years ago
Sultan Khan 3327ad4d29 notification added 7 years ago
Sultan Khan a87afe1d8e worklist main page update 7 years ago
haroon amjad f07de65e5c work list replacement component implemented 7 years ago
haroon amjad 20b8ef5693 Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 7 years ago
Sultan Khan 16e26719f0 worklist-main added 7 years ago
haroon amjad a2511c41ce Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5 7 years ago
haroon amjad 7fe2bef41e EIT Form fixes ongoing 7 years ago
Sultan Khan 8b5436ced6 notification page 7 years ago
Sultan Khan ef0c8a7b8a absence update 7 years ago
haroon amjad 08f588c302 EIT Flow completed 7 years ago
haroon amjad 84643553bf Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
#	Mohem/src/app/hmg-common/services/common/common.service.ts
#	Mohem/src/app/uI-elements/select.input.ts
7 years ago
haroon amjad 700d871dca EIT Forms implementation In-Progress 7 years ago
Sultan Khan 628cc89189 absence page 7 years ago
Sultan Khan a3d58d4b1c absence list added 7 years ago
haroon amjad 892082fb78 My Request Menu implemented 7 years ago
Sultan Khan 75c28539a9 loader updated 7 years ago
Sultan Khan 7d973b62e2 my-team page update 7 years ago
Sultan Khan 41f804e672 my-team page update 7 years ago
ansariakhtar d94be71a2b Solving conflict 7 years ago