Commit Graph

280 Commits (86f8a25bee8727f72f0a5edee13a46fa21728b18)

Author SHA1 Message Date
umasoodch 86f8a25bee Merge branch 'sultan26April' into umar-q2-branch
# Conflicts:
#	Mohem/src/app/profile/home/home.component.html
#	Mohem/src/app/profile/home/home.component.ts
#	Mohem/src/app/profile/profile.module.ts
#	Mohem/src/app/profile/service/profile.service.ts
5 years ago
umasoodch 7b75303583 added logic for eit basic details 5 years ago
Sultan Khan 9e509e143f user profile 5 years ago
umasoodch aa8d2e3d85 commited my profile code 5 years ago
Sultan Khan 3f096133ed back button 5 years ago
Fatimah Alshammari ab0f37ca12 fixed issues in mowdafi HR 5 years ago
Sultan Khan 5cc00cb79d Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April 5 years ago
Sultan Khan b9baa8b12e offers and discount and ERM 5 years ago
umasoodch 7341177275 Merge branch 'MOHEMM-Q2-DEV' into sultan26April 5 years ago
Sultan Khan 6f4f998700 offers and discount 5 years ago
enadhilal e64fbfeada add design for arabic and call API 5 years ago
umasoodch d086e9ebff Merge branch 'Fatima-Q2-June' into MOHEMM-Q2-DEV 5 years ago
Fatimah Alshammari 22afd6fb15 Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
# Conflicts:
#	Mohem/src/app/app-routing.module.ts
5 years ago
Fatimah Alshammari 68371b371a fixed mowadhafi 5 years ago
enadhilal 6dc48c5750 fix icon issue 5 years ago
enadhilal f692fe9d33 add announcement icon 5 years ago
enadhilal da138859fb Merge branch 'MOHEMM-Q2-DEV' into enad-Q1
# Conflicts:
#	Mohem/src/app/hmg-common/services/connector/connector.service.ts
5 years ago
umasoodch e6109e95d5 fixed live URL 5 years ago
Sultan Khan ca96419ca1 ui issues for all designs 5 years ago
enadhilal 780f515449 add announcement service 5 years ago
Sultan Khan 977be243ce Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April 5 years ago
Sultan Khan a9dcd3eb0b ERM Channel design 5 years ago
enadhilal 512465964d Merge branch 'MOHEMM-Q2-DEV' into enad-Q1 5 years ago
enadhilal 5e7f7a6c9c added backend integrations module 5 years ago
Fatimah Alshammari 6f7bd0847b fixed conflicts 5 years ago
Fatimah Alshammari f00547e37f Merge branch 'MOHEMM-Q2-DEV' into Fatima-Q2-June
# Conflicts:
#	Mohem/src/app/hmg-common/services/connector/connector.service.ts
5 years ago
Sultan Khan 3e4d046818 Merge branch 'umar-q2-branch' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April 5 years ago
enadhilal 57467ea800 Item Creation page added 5 years ago
Sultan Khan 7881d3db33 Merge branch 'master-newdesign-15-Dec-location' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April 5 years ago
Fatimah Alshammari bc3251b525 fixed my team design 5 years ago
Sultan Khan df3abc660a new design added with worklist and others 5 years ago
umasoodch ae4d017126 increases version id for mohemm CS 5 years ago
umasoodch 426bfb86ca fixed session issue 5 years ago
enadhilal 15566e4361 change the connector to be in production 5 years ago
enadhilal 3e84cedd4c fixed the login button 5 years ago
enadhilal 65f7385630 add digital id and fixed worklist issues. 5 years ago
enadhilal b2d06f40bf my laptop work 5 years ago
umasoodch ff4f7cc922 added location for wifi as well 5 years ago
umasoodch 0b07d88af0 increased version id 5 years ago
enadhilal c0d4ab610d Merge branch 'master-newdesign-15-Dec-location' into enad-Q1 5 years ago
umasoodch 0da64271fc fixed mohemm Q1 issues 5 years ago
enadhilal 84abf319ac finished all assigned tasks 5 years ago
umasoodch f119467787 removed unused code 5 years ago
umasoodch df47d4d2ed fixed wifi issues 5 years ago
Zohaib Iqbal Kambrani 316ce130fc Android Wifi Attendance Completed... 5 years ago
umasoodch 5e08d8489b removed unused code 5 years ago
umasoodch 33d55363bb Merge branch 'mohemm-wifi-feature' into ZohaibIqbalKambrani
# Conflicts:
#	Mohem/package-lock.json
5 years ago
Zohaib Iqbal Kambrani 7ee282c9fc no message 5 years ago
Zohaib Iqbal Kambrani e67ade154f Mohemm Wifi Attendance, Fix 5 years ago
umasoodch c6ee3e798c fixed worklist and icon issue. Also removed unused plugins. 5 years ago