Commit Graph

223 Commits (eaee656a740b68c01d1815db9bdcefbbd3fed0f6)

Author SHA1 Message Date
faizatflutter c6a95fe7d7 latest push after master merged 10 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
10 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 10 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
10 months ago
faizatflutter 89e9323d9e merged master and updated structure 10 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
10 months ago
aamir-csol 6f98690929 register & changes 10 months ago
aamir-csol 9c52a6122f 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
#	lib/presentation/authantication/login.dart
10 months ago
aamir-csol a4da9db6c3 register & changes 10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
Sultan khan d3aff9f93d updating structure 10 months ago
aamir-csol ea15bd9152 bottom sheet 10 months ago
Haroon Amjad 30fd99d122 android fixes 10 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
10 months ago
aamir-csol 4d76b34608 app bar & chip 10 months ago
aamir-csol 4e3ba99280 widgets & fixes 10 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago
Haroon Amjad 4fcaea2993 updates 10 months ago
Haroon Amjad c65d44ae4d updates 10 months ago
Haroon Amjad 2293db00ea updates 10 months ago
Haroon Amjad b6766654e0 initial commit 10 months ago