Commit Graph

68 Commits (70023f680adc0fe876c6bae9061404abfeb878f9)

Author SHA1 Message Date
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 a77fc49c68 lab result changes 2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
faizatflutter 572fcef0f1 checkUserAuth 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
faizatflutter c6a95fe7d7 latest push after master merged 2 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 2 months ago
faizatflutter 89e9323d9e merged master and updated structure 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Haroon Amjad 4fcaea2993 updates 2 months ago
Haroon Amjad c65d44ae4d updates 2 months ago
Haroon Amjad 2293db00ea updates 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago