 Sikander Saleem
|
d385d0362f
|
merge changes
|
2 months ago |
|
Sikander Saleem
|
6473ccecb5
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/core/app_assets.dart
|
2 months ago |
aamir-csol
|
c27d7301d9
|
calender & signup fixes.
|
2 months ago |
|
aamir-csol
|
da035650c0
|
Merge branch 'master' into dev_aamir
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/generated/locale_keys.g.dart
|
2 months ago |
|
Sikander Saleem
|
85bb00a8fc
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
|
Sikander Saleem
|
38d37fd407
|
custom tab bar added.
|
2 months ago |
|
aamir-csol
|
85fac13314
|
changes
|
2 months ago |
Sultan khan
|
886825a4b9
|
bottom navigation updated.
|
2 months ago |
|
aamir-csol
|
7321da67e3
|
register step 2 & fixes
|
2 months ago |
|
aamir-csol
|
ed24365eff
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
|
2 months ago |
Haroon Amjad
|
f5e655fd35
|
Lab order API implemented
|
2 months ago |
|
aamir-csol
|
d1e1154bdb
|
changes
|
2 months ago |
|
aamir-csol
|
23a4035117
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/home/landing_page.dart
# lib/theme/colors.dart
# lib/widgets/buttons/custom_button.dart
|
2 months ago |
|
aamir-csol
|
67e580447e
|
changes
|
2 months ago |
faizatflutter
|
9509d4a192
|
completed the deviceapi with new architecture
|
2 months ago |
|
aamir-csol
|
8f1e4500cc
|
register & Exception bottom sheet, country dropdown.
|
2 months ago |
|
aamir-csol
|
5e292544d7
|
Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
# lib/main.dart
# lib/presentation/authentication/register.dart
# lib/providers/authentication_view_model.dart
|
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 |
|
aamir-csol
|
6f98690929
|
register & changes
|
2 months ago |
|
Haroon Amjad
|
0a39a00df5
|
Landing page updates
|
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
|
c65d44ae4d
|
updates
|
2 months ago |
|
Haroon Amjad
|
b6766654e0
|
initial commit
|
2 months ago |