 Sikander Saleem
|
200b56a992
|
improvements
|
2 years ago |
 Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
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 |
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 |
Fatimah Alshammari
|
53dabdd853
|
Merge branch 'master' into fatima
|
2 years ago |
|
Fatimah Alshammari
|
be506fa059
|
fix issues
|
2 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug 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 |
|
devmirza121
|
8ce3a09375
|
Login with face and finger fixed
|
2 years ago |
|
Fatimah Alshammari
|
07d4aadc4e
|
added survey screen
|
2 years ago |
|
Fatimah Alshammari
|
957c88f58f
|
fix issues
|
2 years ago |
|
Fatimah Alshammari
|
241172b7e7
|
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
|
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
|
b79edd701c
|
code improvement & translation added.
|
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
|
907b205d21
|
added subordinate leave
|
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
|
416a33b2fd
|
fix design
|
2 years ago |
|
Sikander Saleem
|
169a9bcc60
|
leave balance cont.
|
2 years ago |
|
Sikander Saleem
|
1404715425
|
Vacation rule translation added.
|
2 years ago |
|
Sikander Saleem
|
3750f2c904
|
Vacation rule added complete.
|
2 years ago |
|
Sultan Khan
|
39b916bcc8
|
performance page added
|
2 years ago |
|
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
2 years ago |
|
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
2 years ago |
|
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
2 years ago |
|
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
2 years ago |
|
Fatimah Alshammari
|
1604cba140
|
fix translation.
|
2 years ago |
|
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
2 years ago |
|
Fatimah Alshammari
|
1ef3783fb9
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/profile_api_client.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/profile/delete_familyMember.dart
# lib/ui/profile/family_members.dart
# lib/ui/profile/phone_numbers.dart
# lib/ui/screens/profile/profile_screen.dart
|
2 years ago |
|
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
2 years ago |
|
Sultan Khan
|
06b14394bd
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
e6e150b9e3
|
address phone numbers
|
2 years ago |
|
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
2 years ago |
|
Sikander Saleem
|
95e2e74fd0
|
Merge branch 'master' into development_sikander
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/my_attendance_screen.dart
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
2 years ago |
|
devmirza121
|
2010e9d6a0
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/colors.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/attendance/monthly_attendance.dart
# lib/ui/landing/dashboard.dart
# lib/widgets/radio/show_radio.dart
# pubspec.yaml
|
2 years ago |
|
Fatimah Alshammari
|
60db9041a1
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
assets/langs/en-US.json
lib/ui/profile/contact_details.dart
lib/ui/profile/personal_info.dart
pubspec.yaml
|
2 years ago |
|
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
2 years ago |