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
|
cf1908b44a
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/theme/colors.dart
|
2 months ago |
 haroon amjad
|
8bc49929d4
|
prescription orders list page implemented
|
2 months ago |
|
aamir-csol
|
7321da67e3
|
register step 2 & fixes
|
2 months ago |
|
faizatflutter
|
e2b0930dd1
|
Merge branch 'master' into faiz_dev1
# Conflicts:
# ios/Podfile.lock
# lib/core/app_state.dart
# lib/main.dart
# lib/presentation/authentication/login.dart
# lib/presentation/home/landing_page.dart
# pubspec.yaml
|
2 months ago |
Haroon Amjad
|
0a39a00df5
|
Landing page updates
|
2 months ago |
Sultan khan
|
d3aff9f93d
|
updating structure
|
2 months ago |
|
Haroon Amjad
|
30fd99d122
|
android fixes
|
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 |
|
Faiz Hashmi
|
357cf4392e
|
Updated architecture
|
2 months ago |
|
aamir-csol
|
4e3ba99280
|
widgets & fixes
|
2 months ago |
|
Haroon Amjad
|
2293db00ea
|
updates
|
2 months ago |
|
Haroon Amjad
|
b6766654e0
|
initial commit
|
2 months ago |