Commit Graph

145 Commits (74c2d4c6cabfb00fc72adf0cf5e75f09ac2b58a8)

Author SHA1 Message Date
umasoodch f532fb39e9 resolved conflivt issues 6 years ago
umasoodch 3260ba4dbe Merge branch 'umar-issues' of https://hmg.git.cloudforge.com/mohemmionic5 into umar-issues 6 years ago
umasoodch caae8a9537 fixed loader issue 6 years ago
Mohamed Mekawy d76ed8aa0d merge master-newdesign 6 years ago
Mohamed Mekawy 987ed120f9 Merge branch 'master-newdesign' into umar-issues 6 years ago
ashwaq 77cabbea57 fix conflict with new design 6 years ago
ashwaq 5d978fa175 fix bugs 6 years ago
enadhilal d5226e169d Merge branch 'master-newdesign' into enad-issues 6 years ago
enadhilal 8ea56df598 fix itg bugs 6 years ago
umasoodch a500e054aa fixed loader issue 6 years ago
umasoodch 06f7cfa0fa MM-280
MM-160
MM-202
6 years ago
umasoodch f44ddb6931 added generic header throughout the application 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
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 e7d476fc2e fixed MM-139 MM-134 MM-123 MM-47 6 years ago
ashwaq 5aeab4b08c add MO item History 6 years ago
umasoodch b3fae94a1c MM-96
MM-95 issues fixed
6 years ago
ashwaq 2397fc1482 fix bug 6 years ago
umasoodch ab2ace51b9 MM-112 FIXED - worklist and home loader issue resolved 6 years ago
Mohamed Mekawy 289e5f1452 enhance login 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 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
enadhilal a3109bc0a8 create and design ITG form 6 years ago
umasoodch a78477c192 fixed attendance tracking issue 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
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
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 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