umasoodch
|
5784bead37
|
fixed prod issues
|
6 years ago |
Mohamed Mekawy
|
cde52cb0a2
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Salman Afzal
|
f96c443d2d
|
fixed structural issues and deler unused files
|
6 years ago |
ashwaq
|
72e14308c9
|
fix get subordainte leave in worklist
|
6 years ago |
ashwaq
|
5dfdc112f7
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
c0d1fc309c
|
Merge branch 'ashwaq-fix-bug' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
6d7dca0d12
|
fix design in worklist
|
6 years ago |
enadhilal
|
55107d7a67
|
Merge branch 'master-newdesign' into enad-issues
|
6 years ago |
Salman Afzal
|
561428ee62
|
fixed timer issues
|
6 years ago |
Salman Afzal
|
9ff40c0e1e
|
fixed attendance issues ios and android
|
6 years ago |
enadhilal
|
ea05ef41c6
|
fix design in ITG request
|
6 years ago |
Salman Afzal
|
2386ea258d
|
removed console
|
6 years ago |
Salman Afzal
|
d9facae5ef
|
Merge branch 'master-newdesign' into umar-issues
|
6 years ago |
Salman Afzal
|
85b7e171bb
|
fixed ios issues
|
6 years ago |
Fatimah.Alshammari
|
370b9639af
|
Merge branch 'fatma-issu' of https://hmg.git.cloudforge.com/mohemmionic5 into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
652112de8f
|
fix bugs
|
6 years ago |
enadhilal
|
45f0ab942a
|
fix count in ITG
|
6 years ago |
umasoodch
|
55ded3b340
|
fixed direction issue
|
6 years ago |
umasoodch
|
9984c275da
|
keyboard isuse fixed
|
6 years ago |
umasoodch
|
94a3f61e91
|
fixed refresh issue
|
6 years ago |
enadhilal
|
3a2845afc1
|
Merge branch 'master-newdesign' into enad-issues
|
6 years ago |
enadhilal
|
8d1acd53f8
|
fix user to be list and fix header color for replacment
|
6 years ago |
enadhilal
|
ff04ddc577
|
fix user to be list
|
6 years ago |
Salman Afzal
|
56ab8399d3
|
fixed back button issue
|
6 years ago |
Mohamed Mekawy
|
3e9b97f23f
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
8451b5fdac
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
f4488ea35b
|
fix refresh data from replacment and rfc
|
6 years ago |
Mohamed Mekawy
|
6439edde4e
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
fa39d7119e
|
fix bugs
|
6 years ago |
umasoodch
|
97e715cb3b
|
Merge branch 'master-newdesign' into umar-issues
|
6 years ago |
ashwaq
|
e7963509dc
|
fix text
|
6 years ago |
umasoodch
|
490ef376c3
|
Merge branch 'master-newdesign' into umar-issues
|
6 years ago |
Mohamed Mekawy
|
91b619c1b1
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
168436f754
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Mohamed Mekawy
|
1a5ed615d3
|
edit worklistrfc
|
6 years ago |
Mohamed Mekawy
|
dfaa3583a6
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
077b16f384
|
Merge branch 'master-newdesign' into mekawy-issues
|
6 years ago |
Mohamed Mekawy
|
b183e6ed94
|
edit default value null
|
6 years ago |
umasoodch
|
4a4e159ee5
|
fixed sorting issue
|
6 years ago |
umasoodch
|
f1a58c7dda
|
added more checks
|
6 years ago |
umasoodch
|
bc1a637f93
|
fixed itg issue
|
6 years ago |
umasoodch
|
0167d2de3c
|
Merge branch 'enad-issues' into umar-issues
|
6 years ago |
umasoodch
|
5a11cbfb7e
|
fixed css for itg
|
6 years ago |
enadhilal
|
ba2ac70f86
|
showing comment
|
6 years ago |
umasoodch
|
c23c9173e5
|
fixed scroll issue
|
6 years ago |
umasoodch
|
b64f37b85c
|
Merge branch 'enad-issues' into umar-issues
|
6 years ago |
umasoodch
|
39ade4effe
|
fixed refresh issue
|
6 years ago |
enadhilal
|
0c569178c5
|
Merge branch 'master-newdesign' into enad-issues
|
6 years ago |
Fatimah.Alshammari
|
694628bc5a
|
fix bugs
|
6 years ago |
ashwaq
|
6cc33d40eb
|
fix conflict in sms.page
|
6 years ago |
enadhilal
|
e421e0b8c3
|
fix multi value in ITG
|
6 years ago |
enadhilal
|
483ad8a5d7
|
add latest update under Enad branch
|
6 years ago |
Mohamed Mekawy
|
1c7ec03847
|
fix leave request issue
|
6 years ago |
Mohamed Mekawy
|
3ec23b0a22
|
fix time input issue
|
6 years ago |
ashwaq
|
8e7fd1e810
|
fix legislation code for sms1
|
6 years ago |
ashwaq
|
530a0f3837
|
fix legislation code for sms
|
6 years ago |
Mohamed Mekawy
|
f605919faa
|
edit time input
|
6 years ago |
ashwaq
|
5bba4cb9eb
|
itg succssful msg
|
6 years ago |
ashwaq
|
a2799675e3
|
itg error text1
|
6 years ago |
ashwaq
|
098f81b3c8
|
itg error text
|
6 years ago |
umasoodch
|
06226c89e7
|
fixed issues
|
6 years ago |
ashwaq
|
983da59f1f
|
Merge branch 'ashwaq-fix-bug' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
0f84f35d5a
|
fix sms text, RFC Empty,Notifi-P_information
|
6 years ago |
ashwaq
|
77f7d994f9
|
Merge branch 'ashwaq-fix-bug' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
579b7bd18f
|
fix back of update the form
|
6 years ago |
ashwaq
|
2903783e41
|
fix forget password
|
6 years ago |
Mohamed Mekawy
|
74c2d4c6ca
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
45f20fdd59
|
fix
|
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 |
Mohamed Mekawy
|
04a1007301
|
handle prod build
|
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 |
Mohamed Mekawy
|
081175773f
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
1d8ca3e0ec
|
Merge branch 'fatma-issu' of https://hmg.git.cloudforge.com/mohemmionic5 into fatma-issu
|
6 years ago |
Mohamed Mekawy
|
84545d8e94
|
Merge branch 'master-newdesign' into enad-issues
|
6 years ago |
ashwaq
|
c3397479d8
|
fix conflict
|
6 years ago |
ashwaq
|
3284ab16be
|
add skip
|
6 years ago |
Mohamed Mekawy
|
5e0d1b9b87
|
edit replacment issue & eit arabic text
|
6 years ago |
ashwaq
|
469cb951fa
|
fix conflict trnslate
|
6 years ago |
ashwaq
|
77cabbea57
|
fix conflict with new design
|
6 years ago |
ashwaq
|
469430a155
|
fix conflict with my branch
|
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 |
Fatimah.Alshammari
|
4719af3b89
|
fix bugs
|
6 years ago |
umasoodch
|
a500e054aa
|
fixed loader issue
|
6 years ago |
ashwaq
|
286630dc14
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
921df25487
|
fix submit in replacment , reset info with skip option
|
6 years ago |
umasoodch
|
3d707310f9
|
fixed small screen my-attendance issue
|
6 years ago |
umasoodch
|
7e9e1209ea
|
fixed shift details
|
6 years ago |
umasoodch
|
58edb1c767
|
MM 330 FIXED
|
6 years ago |
Salman Afzal
|
d6e378c699
|
fixed itg issue
|
6 years ago |
umasoodch
|
c6d08ef3df
|
Merge branch 'master-newdesign' into umar-issues
|
6 years ago |
umasoodch
|
ca16ed4ab5
|
fixed UAT issue of itg notifications
|
6 years ago |
Mohamed Mekawy
|
c6f3161eba
|
handle accural ticket balance
|
6 years ago |
Salman Afzal
|
feee5f4c6f
|
fixed arabic text for absence module
|
6 years ago |
Mohamed Mekawy
|
0600969820
|
change text in payslip
|
6 years ago |
Mohamed Mekawy
|
1d6c9bb836
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
5d828cb1de
|
fix bugs
|
6 years ago |
Salman Afzal
|
eb75c92dcb
|
added ar text for timeinput as well
|
6 years ago |
Salman Afzal
|
2c52a898d9
|
added ar text into other date component
|
6 years ago |
umasoodch
|
5538076b13
|
fixed merging conflicts
|
6 years ago |
umasoodch
|
79a79da53a
|
fixed issues
|
6 years ago |
Mohamed Mekawy
|
56e25638bc
|
handle side menu
|
6 years ago |
Mohamed Mekawy
|
487d6573a3
|
Merge branch 'master-newdesign' into mekawy-issues
|
6 years ago |
Mohamed Mekawy
|
68fff95219
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
997b7d3a88
|
Merge branch 'master-newdesign' into fatma-issu
|
6 years ago |
Mohamed Mekawy
|
780822c71c
|
remove time and date picker
|
6 years ago |
Fatimah.Alshammari
|
4deaf4dc38
|
fix bugs
|
6 years ago |
ashwaq
|
aca37f628f
|
inhacment
|
6 years ago |
Fatimah.Alshammari
|
bd0208919c
|
fix bugs
|
6 years ago |
enadhilal
|
fb490fa451
|
fix lang
|
6 years ago |
ashwaq
|
57e6c1e5b3
|
fix merge
|
6 years ago |
ashwaq
|
5a48c8b91c
|
fix duplicate Response Attr 1
|
6 years ago |
ashwaq
|
115a5bbcb2
|
fix duplicate Response Attr
|
6 years ago |
ashwaq
|
30ba667bb4
|
fix VR select , txt confirm, type last login
|
6 years ago |
umasoodch
|
06f7cfa0fa
|
MM-280
MM-160
MM-202
|
6 years ago |
enadhilal
|
03fb59bf34
|
fix placeholder and lang issue
|
6 years ago |
enadhilal
|
e4236f698c
|
fix placeholder and lang issue
|
6 years ago |
enadhilal
|
432c95ab1b
|
fix placeholder and lang issue
|
6 years ago |
ashwaq
|
bd2dbf915f
|
fix job title
|
6 years ago |
Mohamed Mekawy
|
17ad6c7c46
|
fix default value issue
|
6 years ago |
ashwaq
|
00e36290d4
|
fix skip action
|
6 years ago |
enadhilal
|
0d83f70fde
|
fixing rememberMy and remove user name and password text when click athor user
|
6 years ago |
ashwaq
|
ea34f65959
|
remove get notifiction open count
|
6 years ago |
ashwaq
|
49a47fbc34
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
9f1468d3f8
|
return fix issue
|
6 years ago |
umasoodch
|
25ada829df
|
fixed conflict issues
|
6 years ago |
Mohamed Mekawy
|
97f6089272
|
fix conflict in login componemt
|
6 years ago |
Mohamed Mekawy
|
a928d525bc
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
3139188e00
|
Merge branch 'master-newdesign' into ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
9138bfe744
|
handle build --prod issue
|
6 years ago |
ashwaq
|
849894b069
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
41472e61a3
|
merge master-newdesign
|
6 years ago |
umasoodch
|
3a0d2e7285
|
MM-244 fixed
|
6 years ago |
enadhilal
|
3a64980a69
|
fix app direction and itg all segment
|
6 years ago |
enadhilal
|
050eca7245
|
fix app direction and itg all segment
|
6 years ago |
umasoodch
|
196ec6c9e9
|
Completed MM-212
|
6 years ago |
ashwaq
|
2b6b247d23
|
fix merge
|
6 years ago |
umasoodch
|
c11ff4a409
|
Merge branch 'master-newdesign' into umar-issues
|
6 years ago |
umasoodch
|
df50c472a0
|
Fixed MM-227
|
6 years ago |
enadhilal
|
3b3d06ea8a
|
fixing attachment bug and translator issues
|
6 years ago |
enadhilal
|
3f24fa63a7
|
fixing attachment bug and translator issues
|
6 years ago |
Mohamed Mekawy
|
d42ba46ea2
|
edit side menu conflict
|
6 years ago |
Mohamed Mekawy
|
be27e4143d
|
edit home vacation rule issue & my team side menu
|
6 years ago |
ashwaq
|
a3281cb7e9
|
fix tranlate in work list
|
6 years ago |
umasoodch
|
f44ddb6931
|
added generic header throughout the application
|
6 years ago |
Fatimah.Alshammari
|
d4fdf76d18
|
Merge branch 'fatma-issu' of https://hmg.git.cloudforge.com/mohemmionic5 into fatma-issu
|
6 years ago |
Fatimah.Alshammari
|
d74b491dd9
|
Fix issu
|
6 years ago |
ashwaq
|
17de056deb
|
fix continue action - worklist +
|
6 years ago |
ashwaq
|
ee4e36d9fc
|
fix continue action - worklist
|
6 years ago |
ashwaq
|
788b3bfb6e
|
fix pr load more + missing AMU
|
6 years ago |
umasoodch
|
88cabac92f
|
fixed header and production build issues
|
6 years ago |
ashwaq
|
d706ece7b6
|
fix
|
6 years ago |
ashwaq
|
7d55d5bc2f
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug
|
6 years ago |
ashwaq
|
8f3ee08041
|
fix
|
6 years ago |
Mohamed Mekawy
|
8e6c0b18ad
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
27561b686d
|
edit header css
|
6 years ago |
umasoodch
|
df9a283100
|
fixed conflicts
|
6 years ago |
umasoodch
|
bcf8443157
|
fixed header issue in application
|
6 years ago |
Mohamed Mekawy
|
7d8927c1cf
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
a3300453d9
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
871777d181
|
merge ashwaq-fix-bug
|
6 years ago |
Mohamed Mekawy
|
25799a7c78
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
e191b21e44
|
fix issues
|
6 years ago |
enadhilal
|
0538917989
|
fixing btn plus
|
6 years ago |
Fatimah.Alshammari
|
0a0c583053
|
fix bugs
|
6 years ago |
enadhilal
|
02be9dbbe6
|
btn on absence
|
6 years ago |
enadhilal
|
ec609c57ea
|
btn on EIT
|
6 years ago |
ashwaq
|
d4ef8bf7ec
|
fix po attachment + Mo Action
|
6 years ago |
umasoodch
|
4aea82cf7c
|
discard unwanted folders
|
6 years ago |
enadhilal
|
7c4d3327d6
|
fixing menu and scrolling in EIT
|
6 years ago |
Fatimah.Alshammari
|
35781357d3
|
merge master-newdesign
|
6 years ago |
umasoodch
|
d31b76bc44
|
fixed all issues while making prod build
|
6 years ago |
Fatimah.Alshammari
|
043b57383b
|
edit issues
|
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 |
ashwaq
|
1b875b8bc4
|
fix replacment inif
|
6 years ago |
Fatimah.Alshammari
|
7c17cb0913
|
add fix bug
|
6 years ago |
umasoodch
|
4e3d0b0298
|
fixed minor issues of worklist
|
6 years ago |
Salman Afzal
|
38ebbec6f1
|
fixed loading issues
|
6 years ago |
umasoodch
|
7f32c91f5c
|
fixed loading issue at worklist
|
6 years ago |
ashwaq
|
47054eca84
|
fix vacation-rule issue
|
6 years ago |
umasoodch
|
270506a31c
|
fixed multiple popup issues
|
6 years ago |
umasoodch
|
bf317e7274
|
fixed merged issues with master-newdesign
|
6 years ago |
umasoodch
|
e7d476fc2e
|
fixed MM-139 MM-134 MM-123 MM-47
|
6 years ago |
Mohamed Mekawy
|
5ffde37c48
|
merge master-newdesign
|
6 years ago |
umasoodch
|
6db87b6930
|
fixed issue MM-46
|
6 years ago |
umasoodch
|
fcbeae462e
|
fixed MM-134
|
6 years ago |
ashwaq
|
30bfa05c2d
|
fix MO item History
|
6 years ago |
ashwaq
|
5aeab4b08c
|
add MO item History
|
6 years ago |
umasoodch
|
b3fae94a1c
|
MM-96
MM-95 issues fixed
|
6 years ago |
Mohamed Mekawy
|
04e35853a5
|
edit addClass
|
6 years ago |
enadhilal
|
ff40266c6e
|
add all for ITG
|
6 years ago |
Mohamed Mekawy
|
bca40eef6d
|
edit add icon
|
6 years ago |
Mohamed Mekawy
|
0c0cffb75e
|
edit payslip
|
6 years ago |
enadhilal
|
8c1b6dce0e
|
add all for ITG
|
6 years ago |
Mohamed Mekawy
|
8d4bf43fb0
|
merge master-newdesign
|
6 years ago |
ashwaq
|
2397fc1482
|
fix bug
|
6 years ago |
umasoodch
|
14d7419b91
|
rsolved conflicts
|
6 years ago |
umasoodch
|
ab2ace51b9
|
MM-112 FIXED - worklist and home loader issue resolved
|
6 years ago |
Fatimah.Alshammari
|
4f7c11ba49
|
edit arabic work-list
|
6 years ago |
Fatimah.Alshammari
|
821811c8e2
|
edit worklist main page
|
6 years ago |
Fatimah.Alshammari
|
a18c30eaa5
|
general enhancments
|
6 years ago |
umasoodch
|
cb67e2670a
|
issues resolved
|
6 years ago |
ashwaq
|
021e53da26
|
fix worlist
|
6 years ago |
ashwaq
|
ffc298d123
|
fix conflict worlist
|
6 years ago |
umasoodch
|
470e1c7d8e
|
fixed worklist issues
|
6 years ago |
ashwaq
|
66795daf5e
|
add missing files
|
6 years ago |
umasoodch
|
d6dc300cf6
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
9c9b85db3c
|
fixed count issue
|
6 years ago |
Mohamed Mekawy
|
88e7f106bf
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
289e5f1452
|
enhance login
|
6 years ago |
Mohamed Mekawy
|
97525a2854
|
Merge branch 'master-newdesign' into my-requests
|
6 years ago |
Mohamed Mekawy
|
3651f5a04a
|
edit math floor
|
6 years ago |
Fatimah.Alshammari
|
0052bb98ff
|
merge master-newdesign
|
6 years ago |
ashwaq
|
9d4bd2f592
|
fix login conflict
|
6 years ago |
ashwaq
|
14e2654ae4
|
fix login
|
6 years ago |
Mohamed Mekawy
|
5f24329ef9
|
orienttion
|
6 years ago |
ashwaq
|
929844d1ef
|
fix worklist issue
|
6 years ago |
Fatimah.Alshammari
|
0871a67480
|
all conflicting issues are resolved
|
6 years ago |
Fatimah.Alshammari
|
dc1749e48e
|
edit performance appraisal
|
6 years ago |
Fatimah.Alshammari
|
80ab9a5c80
|
general
|
6 years ago |
umasoodch
|
b9f22f4eef
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
68357f35b2
|
fixed worklist flow
|
6 years ago |
Mohamed Mekawy
|
215084f797
|
edit payment info & employee profile update
|
6 years ago |
enadhilal
|
8d1ad091e9
|
add image and fix text and chaneg the BG color for any page did not have data
|
6 years ago |
Mohamed Mekawy
|
f00e63f49d
|
remove image from confirmlogin and sms
|
6 years ago |
Fatimah.Alshammari
|
d2843a8a86
|
Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version
|
6 years ago |
Fatimah.Alshammari
|
7a30805e71
|
add arabic version + fix bugs
|
6 years ago |
enadhilal
|
11dd7e56e4
|
fix profile in arabic and translate
|
6 years ago |
umasoodch
|
717323b9ed
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
d26cea9024
|
fixed attendance and calendar issues
|
6 years ago |
umasoodch
|
98eae4cc7f
|
Merge branch 'master-newdesign' into myteam
|
6 years ago |
umasoodch
|
536e8a9c5a
|
handled multiple shifts and added slider.
|
6 years ago |
Mohamed Mekawy
|
c6409c4620
|
Merge branch 'home' into master-newdesign
|
6 years ago |
enadhilal
|
f82ac02174
|
Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version
|
6 years ago |
enadhilal
|
10ec3c4ec8
|
fixing payslip in arabic version
|
6 years ago |
Mohamed Mekawy
|
8f9ef27ee1
|
add my team to side menu & handle accural balance in absence page
|
6 years ago |
Fatimah.Alshammari
|
25826f900d
|
header translate and quick walkthrouh to test design and translate
|
6 years ago |
ashwaq
|
927bfbace5
|
Merge branch 'work-list' of https://hmg.git.cloudforge.com/mohemmionic5 into work-list
|
6 years ago |
ashwaq
|
85a5087b44
|
fix worklist
|
6 years ago |
ashwaq
|
4a0ca75f6d
|
fix login
|
6 years ago |
enadhilal
|
3eb8914986
|
Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version
|
6 years ago |
enadhilal
|
785538983f
|
adding translate and fixing desgin in worklist and myleave and ticket request
|
6 years ago |
Fatimah.Alshammari
|
43bc72b9b8
|
update translate and fix design
|
6 years ago |
Fatimah.Alshammari
|
5421842188
|
add pull
|
6 years ago |
Mohamed Mekawy
|
0928d55171
|
edit home last login way
|
6 years ago |
Fatimah.Alshammari
|
79feab44e3
|
design dynamic form and translate
|
6 years ago |
Mohamed Mekawy
|
cceb434cf4
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
afed126eaf
|
edit my team icon
|
6 years ago |
enadhilal
|
3740606bd2
|
add translate and fix design in Home, worklist, myLeave and Ticket Request
|
6 years ago |
Mohamed Mekawy
|
024ed04baf
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
b0b76cd5e0
|
add vacation rule icon
|
6 years ago |
umasoodch
|
1aa290f627
|
fixed attendance issue
|
6 years ago |
Mohamed Mekawy
|
ae3a2e4995
|
merge master-newdesign
|
6 years ago |
umasoodch
|
f1157f48f6
|
fixed timecard module
|
6 years ago |
Mohamed Mekawy
|
5557f7d3ba
|
add vacation rule to service list
|
6 years ago |
Mohamed Mekawy
|
8c55d3995a
|
edit time input
|
6 years ago |
Mohamed Mekawy
|
c3339148ed
|
fix my team request for employee list
|
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
|
7ed63baf68
|
added myteam navigation
|
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
|
fee59fb259
|
fix
|
6 years ago |
ashwaq
|
a4ad4e9d49
|
fix static value
|
6 years ago |
ashwaq
|
e7e9ec7b63
|
fix conflict
|
6 years ago |
ashwaq
|
527ee02627
|
add get login last info
|
6 years ago |
Mohamed Mekawy
|
dd7cf45685
|
edit design
|
6 years ago |
umasoodch
|
69ea2637d6
|
my-team attendance issues resolved
|
6 years ago |
Mohamed Mekawy
|
f781cd8eae
|
Merge branch 'master-newdesign' into accural-balance
|
6 years ago |
Mohamed Mekawy
|
a694396f82
|
add click to status button & add icon to service buttons & fix issues
|
6 years ago |
enadhilal
|
36c4bf322b
|
add translate for header and fix the position back arrow in arabic version
|
6 years ago |
Fatimah.Alshammari
|
c1e72539de
|
edit ticketbalance &absense home &payslip header
|
6 years ago |
Mohamed Mekawy
|
08c8ea71b1
|
Merge branch 'master-newdesign' into home
|
6 years ago |
Mohamed Mekawy
|
05387d81d4
|
merge master-newdesign
|
6 years ago |
Mohamed Mekawy
|
70fd9e5ebc
|
edit ticket balance design
|
6 years ago |
Mohamed Mekawy
|
5fcde27564
|
merge master-newdesign
|
6 years ago |
Fatimah.Alshammari
|
d2940a70d0
|
add ticket balance
|
6 years ago |
Mohamed Mekawy
|
c37d469ea7
|
add new design for EIT & Absence subpage
|
6 years ago |
ashwaq
|
18dabcb13e
|
add vacation rule
|
6 years ago |
enadhilal
|
1f50906684
|
make segment active when first open & fixing skip function
|
6 years ago |
Fatimah.Alshammari
|
e71dd383da
|
finish leave balance chart
|
6 years ago |
umasoodch
|
bf825662a9
|
fixed attendance tracking and removed unnecessary code
|
6 years ago |
Mohamed Mekawy
|
d1d3a307b7
|
finish replacement modal
|
6 years ago |
umasoodch
|
05ea5e349f
|
fixed tslint issues
|
6 years ago |
umasoodch
|
8f83946c48
|
Merge branch 'itg-new-design' into work-list
# Conflicts:
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/app/notification/home/home.component.scss
# Mohem/src/app/notification/home/home.component.ts
|
6 years ago |
umasoodch
|
0e17984b20
|
fixed conflict issues
|
6 years ago |
umasoodch
|
14e1c27591
|
added item-type in search
|
6 years ago |
Fatimah.Alshammari
|
e37311f726
|
edit translation
|
6 years ago |
Mohamed Mekawy
|
6385c93e56
|
edit background color
|
6 years ago |
Mohamed Mekawy
|
e3cdfa31eb
|
finish submit absence request
|
6 years ago |
Mohamed Mekawy
|
721066c859
|
finish absence history page
|
6 years ago |
Mohamed Mekawy
|
69db29931f
|
finish absence confirmation page & add absence submit modal
|
6 years ago |
Mohamed Mekawy
|
2ee9d51f7e
|
finish Eit new design
|
6 years ago |
enadhilal
|
a3109bc0a8
|
create and design ITG form
|
6 years ago |
Mohamed Mekawy
|
4d6167d6e8
|
finish confirmation page
|
6 years ago |