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 |
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 |
Sikander Saleem
|
8855eb7622
|
leave balance cont2.
|
2 years ago |
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
2 years ago |
Sikander Saleem
|
fbba3a93a8
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
c0ec2260e5
|
mark attendance improvement.
|
2 years ago |
Sikander Saleem
|
8ae09ce6b9
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!60
|
2 years ago |
Sikander Saleem
|
629de4d2b4
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
2 years ago |
Sikander Saleem
|
2d577dac3f
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!59
|
2 years ago |
Sikander Saleem
|
8ddf531f27
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
fc6b923fc4
|
mowadhafhi improvement.
|
2 years ago |
Fatimah Alshammari
|
8aa14618d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
|
2 years ago |
Sikander Saleem
|
a5e5284d69
|
Merge branch 'development_sikander' into 'master'
mark attendance improvement.
See merge request mirza.shafique/mohem_flutter_app!56
|
2 years ago |
Sikander Saleem
|
9b50c2cf31
|
mark attendance improvement.
|
2 years ago |
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
2 years ago |
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
2 years ago |
Sikander Saleem
|
1f88c531b9
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!55
|
2 years ago |
Sikander Saleem
|
9ac21395d7
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
8247032a52
|
profile options linked with home page personal information.
|
2 years ago |
Sikander Saleem
|
a7a6ea0c4f
|
Merge branch 'development_sikander' into 'master'
Development sikander
See merge request mirza.shafique/mohem_flutter_app!54
|
2 years ago |
Sikander Saleem
|
bd73685bb4
|
Merge branch 'master' into development_sikander
|
2 years ago |
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
2 years ago |
Sikander Saleem
|
5339fe11cb
|
Merge branch 'development_sikander' into 'master'
improvements.
See merge request mirza.shafique/mohem_flutter_app!53
|
2 years ago |
Sikander Saleem
|
11bd7a7085
|
improvements.
|
2 years ago |
Sikander Saleem
|
6d4aa8051d
|
Merge branch 'development_sikander' into 'master'
services menu structure improvements.
See merge request mirza.shafique/mohem_flutter_app!52
|
2 years ago |