taha.alam
|
788887a7f1
|
Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/core/app_assets.dart
# lib/generated/locale_keys.g.dart
# lib/presentation/book_appointment/book_appointment_page.dart
# lib/presentation/home/navigation_screen.dart
|
2 months ago |
taha.alam
|
2174e0e292
|
viewmodel and repo updated for the appointment by region selection.
|
2 months ago |
aamir-csol
|
4e17ff9c82
|
otp screen & register Uae & resend Activation Code.
|
2 months ago |
Haroon Amjad
|
003a161b52
|
custom chips implemented
|
2 months ago |
aamir-csol
|
3db3966c06
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/app_state.dart
|
2 months ago |
aamir-csol
|
484ab56a8e
|
fixes for signup
|
2 months ago |
Sultan khan
|
384ac814f8
|
Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/presentation/lab/lab_orders_page.dart
# lib/widgets/common_bottom_sheet.dart
|
2 months ago |
Sultan khan
|
ba2c8327fe
|
login flow inprogress
|
2 months ago |
haroon amjad
|
2c45356b07
|
Payment module implementation contd.
|
2 months ago |
faizatflutter
|
84804a59a7
|
completed till otp receiving
|
2 months ago |
faizatflutter
|
3e50a3c89d
|
Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
# lib/core/enums.dart
# lib/features/authentication/authentication_view_model.dart
# lib/presentation/authentication/register.dart
# lib/presentation/home/landing_page.dart
|
2 months ago |
faizatflutter
|
6e05ca15cf
|
adding the login function
|
2 months ago |
aamir-csol
|
85fac13314
|
changes
|
2 months ago |
faizatflutter
|
9509d4a192
|
completed the deviceapi with new architecture
|
2 months ago |
Sultan khan
|
cbfb381615
|
Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
# ios/Podfile.lock
# lib/main.dart
# lib/routes/app_routes.dart
# pubspec.lock
|
2 months ago |
aamir-csol
|
4d76b34608
|
app bar & chip
|
2 months ago |
aamir-csol
|
4e3ba99280
|
widgets & fixes
|
2 months ago |
Faiz Hashmi
|
d65dc4ea89
|
initial commit
|
2 months ago |
Haroon Amjad
|
b6766654e0
|
initial commit
|
2 months ago |