Commit Graph

38 Commits (dev_aamir)

Author SHA1 Message Date
tahaalam 90128a812b call ambulance module design added. 2 weeks ago
tahaalam 6cf08c04d2 appointment filters added. 4 weeks ago
haroon amjad 093e645f60 request medical report implementation completed. 1 month ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 month ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 month ago
Sikander Saleem f9859036ef ui improvements. 2 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
2 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 2 months ago
Sultan khan ba2c8327fe login flow inprogress 2 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
2 months ago
haroon amjad efb22aec4e prescription details page implemented 2 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
2 months ago
aamir-csol 85fac13314 changes 2 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
2 months ago
Sultan khan f55d82ddb3 bottom navigation 2 months ago
Haroon Amjad 36c6f0d541 Landing page updates 2 months ago
aamir-csol 7321da67e3 register step 2 & fixes 2 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 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
2 months ago
aamir-csol 67e580447e changes 2 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 2 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
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
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
2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
aamir-csol ea15bd9152 bottom sheet 2 months ago
aamir-csol 4d76b34608 app bar & chip 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago