Commit Graph

422 Commits (cb5650362281798438c4c864a899247dac7d4854)
 

Author SHA1 Message Date
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 3 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 3 months ago
haroon amjad efb22aec4e prescription details page implemented 3 months ago
aamir-csol e41ffd583d changes 3 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
3 months ago
aamir-csol 0309299f44 changes 3 months ago
faizatflutter 6e05ca15cf adding the login function 3 months ago
Haroon Amjad e8f8f6074c prescription details updates 3 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
3 months ago
aamir-csol 85fac13314 changes 3 months ago
Haroon Amjad cd61d08d49 Merge branch 'dev_sultan' 3 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 3 months ago
Sultan khan 886825a4b9 bottom navigation updated. 3 months ago
faizatflutter 32fadb8ad9 completed login function 3 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 3 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 3 months ago
haroon amjad 4c241b0dac Lab orders implemented 3 months ago
Sultan khan fe8c1120a8 assets added 3 months ago
Sultan khan 0de09dd72c no message 3 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
3 months ago
Sultan khan 97c30874b2 Merge remote-tracking branch 'origin/dev_sultan' into dev_sultan 3 months ago
Sultan khan f55d82ddb3 bottom navigation 3 months ago
Haroon Amjad 36c6f0d541 Landing page updates 3 months ago
Haroon Amjad 2b22e17743 android fixes 3 months ago
aamir-csol 7321da67e3 register step 2 & fixes 3 months ago
Sultan khan d87402ae00 bottom navigation 3 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
3 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 3 months ago
Haroon Amjad a77fc49c68 lab result changes 3 months ago
haroon amjad e044fc8c5e lab implementation contd. 3 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 3 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
3 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 3 months ago
faizatflutter 572fcef0f1 checkUserAuth 3 months ago
aamir-csol d1e1154bdb changes 3 months ago
haroon amjad 22e9fb738b assets added 3 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
3 months ago
aamir-csol 67e580447e changes 3 months ago
haroon amjad 9b1c3fe920 medical file updates 3 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
3 months ago
faizatflutter c6a95fe7d7 latest push after master merged 3 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
3 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 3 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 3 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 3 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 3 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
3 months ago
faizatflutter 89e9323d9e merged master and updated structure 3 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
3 months ago
faizatflutter c1221e4970 pushed device api 3 months ago