 Sikander Saleem
|
defa8a8adb
|
redirection added on worklist detail when approve or reject.
|
2 years ago |
haroon amjad
|
aabc86290a
|
Language change option added in app drawer
|
2 years ago |
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
|
haroon amjad
|
27ac98539f
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
4024e5fd3f
|
updates & fixes
|
2 years ago |
|
Sikander Saleem
|
e7d2299b43
|
improvement.
|
2 years ago |
|
Sikander Saleem
|
27b5cbfdf6
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
Sikander Saleem
|
0213a7a4ef
|
worklist api calling delay fixed.
|
2 years ago |
|
Sikander Saleem
|
c29d003401
|
services dynamic list issue fixed on payslip
|
2 years ago |
 Aamir Muhammad
|
90b60ce55a
|
Chat Search User Api Implementation
|
2 years ago |
|
Aamir Muhammad
|
a623765510
|
Merge branch 'master' into development_aamir
|
2 years ago |
|
haroon amjad
|
109c0ca0a2
|
PR PO fixes, Worklist fixes
|
2 years ago |
|
Aamir Muhammad
|
05c6cc7f14
|
Chat Search User Api Implementation
|
2 years ago |
|
Aamir Muhammad
|
d4b31d4338
|
Chat Login Api Implementation
|
2 years ago |
|
haroon amjad
|
8f9fb5eb1d
|
image fixes
|
2 years ago |
|
haroon amjad
|
c8d25c997b
|
Revert "updates"
This reverts commit 981fc9f8d207334488189c9051042d3792452592.
|
2 years ago |
|
haroon amjad
|
da7929bf3e
|
updates
|
2 years ago |
|
Sikander Saleem
|
eea0df3614
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Aamir Muhammad
|
a90da83fa5
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/api/chat/chat_provider_model.dart
|
2 years ago |
|
Sikander Saleem
|
b544273416
|
improvements
|
2 years ago |
|
Aamir Muhammad
|
d24103b872
|
Chat Login Api Implementation
|
2 years ago |
|
Sikander Saleem
|
02aff92726
|
advance search improvement, approve delegate added.
|
2 years ago |
|
Sikander Saleem
|
b429b139c8
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
haroon amjad
|
f07167e734
|
Leave balance fix, Items for sale fix
|
2 years ago |
|
haroon amjad
|
847b9df6fc
|
date fix in dashboard
|
2 years ago |
|
haroon amjad
|
5b5cc16b90
|
Advanced Search implemented
|
2 years ago |
|
Sikander Saleem
|
7aa2e0f000
|
code of conduct, workmen regulations added. & improvement.
|
2 years ago |
|
haroon amjad
|
8923b49546
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/login/login_screen.dart
|
2 years ago |
|
haroon amjad
|
34cb722b96
|
updates
|
2 years ago |
|
Sikander Saleem
|
200b56a992
|
improvements
|
2 years ago |
|
Sikander Saleem
|
49bd4114ce
|
improvements
|
2 years ago |
|
Sikander Saleem
|
d200624ac2
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
|
Aamir Muhammad
|
963dcce941
|
adding chat option on dashboard
|
2 years ago |
|
Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
|
Aamir Muhammad
|
e115137205
|
Chat Implementation Version 1
|
2 years ago |
|
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
2 years ago |
|
Sikander Saleem
|
91abaa8475
|
improvements.
|
2 years ago |
|
Sikander Saleem
|
5c5da60b12
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
d61315a5fe
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
f0ec4843b4
|
end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
|
2 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
2 years ago |
Sultan khan
|
eaae618f25
|
bug fixes
|
2 years ago |
|
Sultan khan
|
b3d76df457
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
|
2 years ago |
|
Sultan khan
|
398880c4ad
|
bug fixes
|
2 years ago |
devmirza121
|
0d0832277f
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/work_list/worklist_fragments/detail_fragment.dart
# lib/ui/work_list/worklist_fragments/info_fragments.dart
# pubspec.yaml
|
2 years ago |
|
devmirza121
|
116175efaa
|
Work list UI Change
|
2 years ago |
|
Sikander Saleem
|
bf7a18b91c
|
action colors added. contact details improvement
|
2 years ago |
|
Sikander Saleem
|
f36606f603
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/work_list/work_list_screen.dart
|
2 years ago |
|
Sikander Saleem
|
06810486e3
|
dynamic list center issue fixed.
|
2 years ago |
|
Sultan khan
|
ca3febeccd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app
|
2 years ago |
|
Sultan khan
|
8d9561b570
|
COC changes
|
2 years ago |
|
Sikander Saleem
|
d6315b0674
|
fixes.
|
2 years ago |
|
Sikander Saleem
|
ba8e272885
|
pull to refresh added on worklist screen.
|
2 years ago |
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
2 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
2 years ago |
|
Sikander Saleem
|
ba65fbb79d
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
13e9c5fa21
|
centering issue in dynamic list view screen fixed.
|
2 years ago |
|
haroon amjad
|
e65beebfe8
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
|
haroon amjad
|
866bb8a29e
|
Pull to refresh, Items for Sale & Offers n Discounts fixes
|
2 years ago |
|
haroon amjad
|
4c1927bee5
|
ITG request flow fixed
|
2 years ago |
|
haroon amjad
|
9f74c3c39a
|
ITG request flow fixed
|
2 years ago |
|
Sikander Saleem
|
6cd0c4c358
|
improvement.
|
2 years ago |
|
Sikander Saleem
|
e8c8c225c7
|
icon direction bug fixes
|
2 years ago |
|
devmirza121
|
0fa88555fb
|
Employee Digital Id Fixed
|
2 years ago |
|
Sikander Saleem
|
ef96f9703f
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
2 years ago |
|
devmirza121
|
c05b8eee29
|
Remote Changed
|
2 years ago |
|
haroon amjad
|
f6c9b6dce9
|
Updates & fixes
|
2 years ago |
|
Sikander Saleem
|
0c7fbde013
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/ui/my_attendance/services_menu_list_screen.dart
|
2 years ago |
|
Sikander Saleem
|
9a0131277b
|
create request by manager in my team, improvements
|
2 years ago |
|
haroon amjad
|
dd26452663
|
Fixes & updates
|
2 years ago |
|
Sikander Saleem
|
9ce042e7d3
|
bussiness card improvement.
|
2 years ago |
|
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
2 years ago |
|
devmirza121
|
d8938ba256
|
improvement
|
2 years ago |
|
devmirza121
|
599b8b8f4b
|
Login Flag issue fixed
|
2 years ago |
|
devmirza121
|
9412348cde
|
Merge branch 'master' into development_mirza
|
2 years ago |
|
haroon amjad
|
20e6a6ddc3
|
Attendance fixes
|
2 years ago |
Sikander Saleem
|
692a105bad
|
ios fixes-2
|
2 years ago |
|
haroon amjad
|
492a1a9736
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
e6405b2251
|
NFC fixes
|
2 years ago |
|
haroon amjad
|
eb29553d26
|
NFC Fixes
|
2 years ago |
|
Sikander Saleem
|
90649a0259
|
password visible option added.
|
2 years ago |
|
Fatimah Alshammari
|
df622d28dc
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
c0f333e14b
|
fix issues
|
2 years ago |
|
haroon amjad
|
b0b84c572c
|
Last Login Fixes
|
2 years ago |
|
Sikander Saleem
|
e090b9be0b
|
Merge branch 'development_mirza' into 'master'
Login with face and finger fixed
See merge request mirza.shafique/mohem_flutter_app!83
|
2 years ago |
|
Fatimah Alshammari
|
c664125c8f
|
fix issues
|
2 years ago |
|
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
2 years ago |
|
Fatimah Alshammari
|
ff623b12ad
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
|
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
2 years ago |
|
Sikander Saleem
|
20ffb73dd8
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
2 years ago |
|
Sikander Saleem
|
ea2a9c541c
|
change password screen added.
|
2 years ago |
|
Fatimah Alshammari
|
442f6d8180
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
2 years ago |
|
Sikander Saleem
|
53bf7d68ed
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!78
|
2 years ago |
|
Sikander Saleem
|
97bd497866
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
4e22784676
|
ticket balance dashboard added.
|
2 years ago |
|
Fatimah Alshammari
|
241172b7e7
|
fix issues
|
2 years ago |
|
Fatimah Alshammari
|
c2142c9997
|
fix issues
|
2 years ago |
|
Fatimah Alshammari
|
48e582af82
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
8fa4670392
|
fix issues
|
2 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
2 years ago |
|
Sikander Saleem
|
8120a69fd3
|
monthly attendance fixes.
|
2 years ago |
|
Fatimah Alshammari
|
ffba702cf9
|
fix issues
|
2 years ago |
|
Fatimah Alshammari
|
b7685295d9
|
fix design issues
|
2 years ago |
|
Sikander Saleem
|
cfe0460ea5
|
my team issues fixed
|
2 years ago |
|
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
2 years ago |
|
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
2 years ago |
|
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
2 years ago |
|
Sikander Saleem
|
2eedef7c2c
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
7eadd97869
|
item for sale ui improvements & translation added.
|
2 years ago |
Sultan Khan
|
70a7108d9c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
|
Sultan Khan
|
f3477fb5f3
|
perforamce page updates
|
2 years ago |
|
Sikander Saleem
|
f647b32c65
|
item for sale improvement.
|
2 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
2 years ago |
|
Fatimah Alshammari
|
414cc587ea
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
2 years ago |
|
Fatimah Alshammari
|
a55e4bf84f
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
83b51ae589
|
fix design issues
|
2 years ago |
|
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
2 years ago |
|
Sikander Saleem
|
55cafb5466
|
improvement.
|
2 years ago |
|
haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
|
Sikander Saleem
|
2ce3c535d2
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
|
2 years ago |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
2 years ago |
|
Fatimah Alshammari
|
07636bef77
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
907b205d21
|
added subordinate leave
|
2 years ago |
|
Sikander Saleem
|
ee2c74b5da
|
leave balance submit request added.
|
2 years ago |
|
Sikander Saleem
|
cf7843191b
|
leave balance added.
|
2 years ago |
|
Fatimah Alshammari
|
bee1aef03e
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/models/get_user_item_type_list.dart
# lib/models/my_team/get_attendance_tracking_list_model.dart
# lib/models/my_team/get_employee_subordinates_list.dart
# lib/models/update_item_type_success_list.dart
# lib/models/update_user_item_type_list.dart
# lib/models/worklist/update_user_type_list.dart
# lib/ui/my_team/view_attendance.dart
# lib/ui/profile/contact_details.dart
|
2 years ago |
|
Fatimah Alshammari
|
d640ce29de
|
fix issue
|
2 years ago |
|
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
2 years ago |
|
Sikander Saleem
|
9186e3cdaa
|
leave balance validate model added.
|
2 years ago |
|
Sikander Saleem
|
af170b2b02
|
missing swipe,ticket balance home screen item linked with corresponding screen.
|
2 years ago |
|
Sikander Saleem
|
41a1ba125e
|
code improvements.
|
2 years ago |
|
Sikander Saleem
|
9314ea0514
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
|
2 years ago |
|
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
2 years ago |
|
haroon amjad
|
50f203cd55
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
2 years ago |
|
Sikander Saleem
|
171735202b
|
leave balance cont3.
|
2 years ago |
|
Sikander Saleem
|
2278a1e98f
|
Merge remote-tracking branch 'origin/development_sikander' into development_sikander
# Conflicts:
# lib/ui/leave_balance/add_leave_balance_screen.dart
|
2 years ago |
|
Sikander Saleem
|
d5c8604f32
|
leave balance cont3.
|
2 years ago |
|
Sikander Saleem
|
a14103b859
|
leave balance cont3.
|
2 years ago |
|
haroon amjad
|
7c0589ef32
|
Announcement details fixes
|
2 years ago |
|
haroon amjad
|
52438ce711
|
offers & discounts implemented
|
2 years ago |
|
haroon amjad
|
028caf1379
|
Offers & Discounts implemented
|
2 years ago |
|
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
2 years ago |