Commit Graph

73 Commits (59ad00ca2afca0fc3b6bd9c0f0db3d7d9bdea806)

Author SHA1 Message Date
Aamir Muhammad 55ff08c3f3 Chat Favorite Screen & Fixes 2 years ago
mirza.shafique 5880e22771 merge fix 2 years ago
devmirza121 f06238a93f OTP dialog new design 2 years ago
Fatimah Alshammari 79774416b4 Merge branch 'master' into fatima
# Conflicts:
#	lib/generated/codegen_loader.g.dart
2 years ago
Fatimah Alshammari 69ded3dc43 fix my request 2 years ago
FaizHashmiCS22 5ed9991428 Added new Intimmation Screens with Lottie 2 years ago
FaizHashmiCS22 3d7b80b8a0 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
2 years ago
FaizHashmiCS22 60e7b5a2a0 Adjusted the font settings 2 years ago
FaizHashmiCS22 3c6e4a725f Merge branch 'master' into faiz_cs
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
2 years ago
Fatimah Alshammari f515c0b39a Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 2 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 2 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 2 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 2 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 2 years ago
Sikander Saleem 200b56a992 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 57ebe40b5d Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
2 years ago
Sikander Saleem 91abaa8475 improvements. 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 be506fa059 fix issues 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 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