Commit Graph

78 Commits (c51af6522cc2707f05f3a799005a197a756ebf6c)

Author SHA1 Message Date
Fatimah Alshammari c51af6522c fix issues 3 years ago
Sikander Saleem 1fb585a438 Chat Fixes 3 years ago
Aamir Muhammad 670a5fbc03 Chat Favorite Screen & Fixes 3 years ago
Aamir Muhammad 83aabd0555 Chat Favorite Screen & Fixes 3 years ago
haroon amjad 221bf28ddd Merge branch 'master' into development_haroon 3 years ago
haroon amjad 7cc110b9a1 JIRA fixes 3 years ago
mirza.shafique 5880e22771 merge fix 3 years ago
devmirza121 f06238a93f OTP dialog new design 3 years ago
Fatimah Alshammari 79774416b4 Merge branch 'master' into fatima
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
Fatimah Alshammari 69ded3dc43 fix my request 3 years ago
Sikander Saleem 1cd7cd4d76 issues fixed. 3 years ago
FaizHashmiCS22 5ed9991428 Added new Intimmation Screens with Lottie 3 years ago
FaizHashmiCS22 3d7b80b8a0 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
3 years ago
FaizHashmiCS22 60e7b5a2a0 Adjusted the font settings 3 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 3 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
3 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
3 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 3 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 3 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 3 years ago
Sikander Saleem 200b56a992 improvements 3 years ago
Sikander Saleem 91abaa8475 improvements. 3 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 3 years ago
Fatimah Alshammari 53dabdd853 Merge branch 'master' into fatima 3 years ago
Fatimah Alshammari be506fa059 fix issues 3 years ago
Sikander Saleem 95b60181b1 bug fixes 3 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 3 years ago
Fatimah Alshammari 957c88f58f fix issues 3 years ago
Fatimah Alshammari 241172b7e7 fix issues 3 years ago
Fatimah Alshammari b7685295d9 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
Sikander Saleem b79edd701c code improvement & translation added. 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 907b205d21 added subordinate leave 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 416a33b2fd fix design 3 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 3 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 3 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari b502e038a5 fix issue 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 3 years ago
Fatimah Alshammari aca788ae26 fix translations 3 years ago
Fatimah Alshammari 1604cba140 fix translation. 3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 3 years ago
Sultan Khan 3c777d220e basic details 3 years ago