Commit Graph

712 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)
 

Author SHA1 Message Date
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 fe8c1120a8 assets added 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 97c30874b2 Merge remote-tracking branch 'origin/dev_sultan' into dev_sultan 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
Sultan khan d87402ae00 bottom navigation 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 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
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 10 months ago
faizatflutter 572fcef0f1 checkUserAuth 10 months ago
aamir-csol d1e1154bdb changes 10 months ago
haroon amjad 22e9fb738b assets added 10 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
10 months ago
aamir-csol 67e580447e changes 10 months ago
haroon amjad 9b1c3fe920 medical file updates 10 months ago
Haroon6138 6c99f63588 Merge pull request 'faiz_dev1' (#3) from faiz_dev1 into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/3
10 months ago
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
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
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
faizatflutter c1221e4970 pushed device api 10 months ago
aamir-csol 6f98690929 register & changes 10 months ago
Sultan khan 4e010bb2cf initial commit 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 8ed8637108 Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	lib/presentation/authantication/login.dart
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