Commit Graph

42 Commits (699ef2f672ce84e0a14fbd0d265e2aad602535c2)

Author SHA1 Message Date
faizatflutter d4dd475e0b Added Graph 2 weeks ago
aamir-csol 135b05e561 Health calculators & converters 3 weeks ago
aamir-csol 0f17a655ed Merge branch 'master' into dev_aamir
# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart
1 month ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
2 months ago
tahaalam 5b0a8ad898 cancel and listing request added 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 3 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 3 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 3 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
3 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
aamir-csol 24362f67cb family screen & widgets 3 months ago
aamir-csol d918b6e464 family screen & widgets 3 months ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
faizatflutter 94313b8870 Improved Error Handling 4 months ago
aamir-csol 47ce5022d3 family screen & widgets 4 months ago
aamir-csol f9bfc131a8 family screen & widgets 4 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 4 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 4 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 4 months ago
Haroon Amjad b240293064 medical file implementation contd. 4 months ago
Sultan khan a199ca040b quick login inprogress 4 months ago
Sultan khan ba2c8327fe login flow inprogress 4 months ago
aamir-csol 52fddc5323 login flow completion 4 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
4 months ago
Sikander Saleem d385d0362f merge changes 4 months ago
faizatflutter 84804a59a7 completed till otp receiving 4 months ago
faizatflutter 6e05ca15cf adding the login function 4 months ago
faizatflutter 32fadb8ad9 completed login function 4 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 5 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 5 months ago
Sultan khan d3aff9f93d updating structure 5 months ago
Faiz Hashmi 357cf4392e Updated architecture 5 months ago
Faiz Hashmi d65dc4ea89 initial commit 5 months ago
Haroon Amjad 4fcaea2993 updates 5 months ago
Haroon Amjad b6766654e0 initial commit 5 months ago