Commit Graph

285 Commits (4cc4a7b0d9beaa3bbcfc7b25f541ab33eff6dfeb)

Author SHA1 Message Date
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
9 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
9 months ago
haroon amjad 2d5f2b1deb updates 9 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem d385d0362f merge changes 9 months ago
faizatflutter 923f7d7781 completed till otp receiving 9 months ago
faizatflutter 84804a59a7 completed till otp receiving 9 months ago
Sultan khan 3cafc16d50 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
9 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8
9 months ago
aamir-csol c27d7301d9 calender & signup fixes. 9 months ago
Sultan khan 29aae34726 lab search added 9 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 9 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
9 months ago
aamir-csol 3855ba276f calender & signup fixes. 9 months ago
haroon amjad 333b813f90 bottom sheet fixes 9 months ago
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 9 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 9 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 9 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 9 months ago
haroon amjad efb22aec4e prescription details page implemented 9 months ago
aamir-csol e41ffd583d changes 9 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
9 months ago
aamir-csol 0309299f44 changes 9 months ago
faizatflutter 6e05ca15cf adding the login function 9 months ago
Haroon Amjad e8f8f6074c prescription details updates 9 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
9 months ago
aamir-csol 85fac13314 changes 9 months ago
Haroon Amjad cd61d08d49 Merge branch 'dev_sultan' 9 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 9 months ago
Sultan khan 886825a4b9 bottom navigation updated. 9 months ago
faizatflutter 32fadb8ad9 completed login function 9 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 9 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 9 months ago
haroon amjad 4c241b0dac Lab orders implemented 9 months ago
Sultan khan 0de09dd72c no message 9 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
9 months ago
Sultan khan f55d82ddb3 bottom navigation 9 months ago
Haroon Amjad 36c6f0d541 Landing page updates 9 months ago
Haroon Amjad 2b22e17743 android fixes 9 months ago
aamir-csol 7321da67e3 register step 2 & fixes 9 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
9 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 9 months ago
Haroon Amjad a77fc49c68 lab result changes 9 months ago
haroon amjad e044fc8c5e lab implementation contd. 9 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 9 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 9 months ago
faizatflutter 572fcef0f1 checkUserAuth 9 months ago
aamir-csol d1e1154bdb changes 9 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
9 months ago
aamir-csol 67e580447e changes 9 months ago
haroon amjad 9b1c3fe920 medical file updates 9 months ago
faizatflutter c6a95fe7d7 latest push after master merged 9 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
9 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 9 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 9 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 9 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 9 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
9 months ago
faizatflutter 89e9323d9e merged master and updated structure 9 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
9 months ago
faizatflutter c1221e4970 pushed device api 9 months ago
aamir-csol 6f98690929 register & changes 9 months ago
Sultan khan 4e010bb2cf initial commit 9 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
9 months ago
aamir-csol a4da9db6c3 register & changes 9 months ago
Haroon Amjad 0a39a00df5 Landing page updates 9 months ago
Sultan khan d3aff9f93d updating structure 9 months ago
aamir-csol 8ed8637108 Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	lib/presentation/authantication/login.dart
9 months ago
aamir-csol ea15bd9152 bottom sheet 9 months ago
Haroon Amjad 30fd99d122 android fixes 9 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
9 months ago
faizatflutter 45e868adba pushed new API 9 months ago
aamir-csol 4d76b34608 app bar & chip 9 months ago
Faiz Hashmi 357cf4392e Updated architecture 9 months ago
aamir-csol 255d189ce1 widgets & fixes 9 months ago
aamir-csol 4e3ba99280 widgets & fixes 9 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