Commit Graph

26 Commits (ed24365eff0f20c1d682b8fdb0a76765a671e532)

Author SHA1 Message Date
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
10 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 10 months ago
Haroon Amjad a77fc49c68 lab result changes 10 months ago
haroon amjad e044fc8c5e lab implementation contd. 10 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 10 months ago
aamir-csol d1e1154bdb changes 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
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 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
faizatflutter c1221e4970 pushed device api 10 months ago
Sultan khan 4e010bb2cf initial commit 10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
Sultan khan d3aff9f93d updating structure 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
Faiz Hashmi 357cf4392e Updated architecture 10 months ago
aamir-csol 255d189ce1 widgets & fixes 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 b6766654e0 initial commit 10 months ago