Commit Graph

11 Commits (ff4a546e5f7f88cf88b3ae40d93f7a724a8d1273)

Author SHA1 Message Date
Fatimah Alshammari aca788ae26 fix translations 3 years ago
devmirza121 7ca9096d89 Merge issue 2.0 3 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
Fatimah Alshammari 57bf34a93a fix translation. 3 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
3 years ago
Fatimah Alshammari 30ca1894db fix issues. 3 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
haroon amjad 427c5fb5b6 Pending Transactions implemented 3 years ago
haroon amjad cf523566cd Mowadhafi home & details page done 3 years ago
Sultan Khan 6e86c0ba38 profile details 3 years ago