Commit Graph

30 Commits (e5b3704863b3807ca0c215f41dff568155a9a4f6)

Author SHA1 Message Date
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
2 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 2 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 2 months ago
Haroon Amjad b240293064 medical file implementation contd. 2 months ago
haroon amjad ccd29f0cf9 updates 2 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
2 months ago
Sultan khan ba2c8327fe login flow inprogress 2 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 2 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 2 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
2 months ago
faizatflutter 84804a59a7 completed till otp receiving 2 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 2 months ago
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 32fadb8ad9 completed login function 2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 2 months ago
Haroon Amjad a77fc49c68 lab result changes 2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
faizatflutter 89e9323d9e merged master and updated structure 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
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
Faiz Hashmi d65dc4ea89 initial commit 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