Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
3d11273738
|
fix design issues
|
2 years ago |
 Sikander Saleem
|
4a5df86ca8
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!72
|
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 |
|
Sikander Saleem
|
fba3b2e88c
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!71
|
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
|
ff954fa51e
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!70
|
2 years ago |
|
Sikander Saleem
|
07fe434473
|
Merge branch 'master' into development_sikander
|
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 |
|
Sikander Saleem
|
a759f5c3a7
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!69
|
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 |
|
Sikander Saleem
|
68862067de
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request mirza.shafique/mohem_flutter_app!68
|
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 |
|
Sikander Saleem
|
8bb13cfb3a
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!67
|
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
|
9d23006f60
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!66
|
2 years ago |
|
Sikander Saleem
|
ee2c74b5da
|
leave balance submit request added.
|
2 years ago |
|
Sikander Saleem
|
402af042d5
|
Merge branch 'master' into development_sikander
|
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
|
e7e6d6e7a1
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!65
|
2 years ago |
|
Sikander Saleem
|
1ec0498cb9
|
Merge branch 'master' into development_sikander
|
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
|
5cdacf89d0
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!64
|
2 years ago |
|
Sikander Saleem
|
60c1eb548f
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
af170b2b02
|
missing swipe,ticket balance home screen item linked with corresponding screen.
|
2 years ago |
|
Sikander Saleem
|
0fdafcd7fc
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!63
|
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 |
|
Sikander Saleem
|
4e12c1899d
|
Merge branch 'Fatima' into 'master'
Fatima
See merge request mirza.shafique/mohem_flutter_app!58
|
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 |