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 |
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
|
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 |
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 |
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
|
7 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
7 years ago |
mohamed.mekawy
|
ad56814966
|
fix notification & home
|
7 years ago |
mohamed.mekawy
|
492eb5d912
|
edit Icon
|
7 years ago |
haroon amjad
|
9b35e22a98
|
new Al Habib Mohemm App
|
7 years ago |
mohamed.mekawy
|
ce88e72248
|
solve bugs
|
7 years ago |
haroon amjad
|
8915e67b00
|
fixes
|
7 years ago |