Fatimah Alshammari
|
68371b371a
|
fixed mowadhafi
|
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
|
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 |
umasoodch
|
0da64271fc
|
fixed mohemm Q1 issues
|
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 |
Zohaib Iqbal Kambrani
|
424d02c9e1
|
no message
|
5 years ago |
umasoodch
|
0a6633c74b
|
fixed splash issues and network issue
|
5 years ago |
umasoodch
|
b9e58a3739
|
deleted unused code
|
5 years ago |
umasoodch
|
077538efe5
|
fixed nfc issues
|
5 years ago |
umasoodch
|
1424c27008
|
added changes for NFC
|
5 years ago |
umasoodch
|
0816b3af40
|
nfc completed on production
|
5 years ago |
umasoodch
|
b7fc960ce7
|
completed NFC for CS Mohemm
|
5 years ago |
umasoodch
|
e4525ea728
|
fixed timer issue login forgot password disable issue and handled version issue
|
5 years ago |
umasoodch
|
e1a2a9840f
|
fixed location issue for ios and separated code for
|
5 years ago |
umasoodch
|
a813addd92
|
completed location for cloud solutions mohemm
|
5 years ago |
umasoodch
|
85b5416703
|
added backgroundgeo location
|
5 years ago |
Mohamed Mekawy
|
0cdfa51048
|
edit version no
|
6 years ago |
ashwaq
|
6d7dca0d12
|
fix design in worklist
|
6 years ago |
Mohamed Mekawy
|
91b619c1b1
|
merge master-newdesign
|
6 years ago |
enadhilal
|
0c569178c5
|
Merge branch 'master-newdesign' into enad-issues
|
6 years ago |
ashwaq
|
6cc33d40eb
|
fix conflict in sms.page
|
6 years ago |
enadhilal
|
483ad8a5d7
|
add latest update under Enad branch
|
6 years ago |
ashwaq
|
098f81b3c8
|
itg error text
|
6 years ago |
ashwaq
|
0f84f35d5a
|
fix sms text, RFC Empty,Notifi-P_information
|
6 years ago |
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 |