Commit Graph

71 Commits (f92bcf4c32baf8fb67bf99f7dc35e843f8f179fd)

Author SHA1 Message Date
umasoodch f92bcf4c32 fixed config files issue 5 years ago
Sultan Khan df3abc660a new design added with worklist and others 5 years ago
umasoodch c9dce385dd fixed issues found during demo 5 years ago
umasoodch 839f752a58 fixed wifi check 5 years ago
umasoodch 33d55363bb Merge branch 'mohemm-wifi-feature' into ZohaibIqbalKambrani
# Conflicts:
#	Mohem/package-lock.json
5 years ago
Zohaib Iqbal Kambrani 3c9ed6c674 Update gif Icon and platform 5 years ago
Zohaib Iqbal Kambrani 7ee282c9fc no message 5 years ago
umasoodch c6ee3e798c fixed worklist and icon issue. Also removed unused plugins. 5 years ago
Zohaib Iqbal Kambrani 424d02c9e1 no message 5 years ago
umasoodch b9e58a3739 deleted unused code 5 years ago
umasoodch 077538efe5 fixed nfc issues 5 years ago
umasoodch b7fc960ce7 completed NFC for CS Mohemm 5 years ago
umasoodch 6f92708417 mohemm dev for background location android completed 5 years ago
umasoodch 85b5416703 added backgroundgeo location 5 years ago
enadhilal 050eca7245 fix app direction and itg all segment 6 years ago
enadhilal 3f24fa63a7 fixing attachment bug and translator issues 6 years ago
Mohamed Mekawy bca40eef6d edit add icon 6 years ago
enadhilal 785538983f adding translate and fixing desgin in worklist and myleave and ticket request 6 years ago
Mohamed Mekawy afed126eaf edit my team icon 6 years ago
Mohamed Mekawy ae3a2e4995 merge master-newdesign 6 years ago
Mohamed Mekawy 5557f7d3ba add vacation rule to service list 6 years ago
Mohamed Mekawy 8c55d3995a edit time input 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
Mohamed Mekawy dd7cf45685 edit design 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
enadhilal 2f55272c91 new-time-card 6 years ago
umasoodch 96971a6b68 resolved conflict issues with master branch 6 years ago
umasoodch 9177721b59 completed worklist task 6 years ago
Mohamed Mekawy 52d9e04dac merge master-newdesign with emp-profile 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 e629aab07a merged and fixed all the conflicting issues and also removed unnecessary code 6 years ago
umasoodch 1c62b10486 merged master-newdesign with home branch and resolved all conflicts 6 years ago
umasoodch 11432b633e timer added according to the shift hours 6 years ago
umasoodch c955a19ae8 pushed timer code 6 years ago
Fatimah.Alshammari cb1aad91f9 edit side menue new design 6 years ago
Mohamed Mekawy a6fe8c183a merdge dashbored services to new design 6 years ago
umasoodch fd663493e6 fixed plugin firebase issue 6 years ago
umasoodch 338205b305 Removed onw signal and added firebasex plugin 6 years ago
umasoodch 9218d02195 Merge branch 'master' into firebasex
# Conflicts:
#	Mohem/package.json
6 years ago
umasoodch 5c7a30f308 added firebase token instead of one signal 6 years ago
Mohamed Mekawy 1555ad5c91 edit change password page 6 years ago
Mohamed Mekawy 2a1ca91daa OpenPayslip from dashboard 6 years ago
Mohamed Mekawy 6d99285451 handle build error by removin backgroud location plugin 6 years ago
Mohamed Mekawy 5c4377034f enhance 6 years ago
Mohamed Mekawy c9e7e5a851 general enhancments 6 years ago
enadhilal 0d05073e71 push Enad code workList page 6 years ago
enadhilal 22f9a0ac56 update on workList page 6 years ago