Sikander Saleem
|
3c49a45516
|
ios fixes
|
3 years ago |
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
3 years ago |
 Sikander Saleem
|
20ffb73dd8
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
3 years ago |
|
Sikander Saleem
|
ea2a9c541c
|
change password screen added.
|
3 years ago |
Fatimah Alshammari
|
442f6d8180
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
53bf7d68ed
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!78
|
3 years ago |
|
Sikander Saleem
|
97bd497866
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
4e22784676
|
ticket balance dashboard added.
|
3 years ago |
|
Fatimah Alshammari
|
241172b7e7
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
c2142c9997
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
48e582af82
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
8fa4670392
|
fix issues
|
3 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
3 years ago |
|
Sikander Saleem
|
8120a69fd3
|
monthly attendance fixes.
|
3 years ago |
|
Fatimah Alshammari
|
ffba702cf9
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
b7685295d9
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
cfe0460ea5
|
my team issues fixed
|
3 years ago |
|
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
3 years ago |
|
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
3 years ago |
|
Sikander Saleem
|
2eedef7c2c
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
7eadd97869
|
item for sale ui improvements & translation added.
|
3 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
|
3 years ago |
|
Sultan Khan
|
f3477fb5f3
|
perforamce page updates
|
3 years ago |
|
Sikander Saleem
|
f647b32c65
|
item for sale improvement.
|
3 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
3 years ago |
|
Fatimah Alshammari
|
414cc587ea
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
3 years ago |
|
Fatimah Alshammari
|
a55e4bf84f
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
83b51ae589
|
fix design issues
|
3 years ago |
|
Sikander Saleem
|
3cd3aaa6d3
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/ui/landing/widget/app_drawer.dart
|
3 years ago |
|
Sikander Saleem
|
55cafb5466
|
improvement.
|
3 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
|
3 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
|
3 years ago |
|
Sikander Saleem
|
6be8510b86
|
drawer menu ui changed.
|
3 years ago |
|
Fatimah Alshammari
|
07636bef77
|
Merge branch 'master' into Fatima
|
3 years ago |
|
Fatimah Alshammari
|
907b205d21
|
added subordinate leave
|
3 years ago |
|
Sikander Saleem
|
ee2c74b5da
|
leave balance submit request added.
|
3 years ago |
|
Sikander Saleem
|
cf7843191b
|
leave balance added.
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
d640ce29de
|
fix issue
|
3 years ago |
|
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
3 years ago |
|
Sikander Saleem
|
af170b2b02
|
missing swipe,ticket balance home screen item linked with corresponding screen.
|
3 years ago |
|
Sikander Saleem
|
41a1ba125e
|
code improvements.
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
3 years ago |