haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
4 years ago |
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
4 years ago |
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
4 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
4 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
|
4 years ago |
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
4 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
|
4 years ago |
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
4 years ago |
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
4 years ago |
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
4 years ago |
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
4 years ago |
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
4 years ago |
Sultan Khan
|
6e86c0ba38
|
profile details
|
4 years ago |