Commit Graph

60 Commits (3d8daeb58dd73ae0d256da54fd7dd8c3feba1301)

Author SHA1 Message Date
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
1 month ago
Fatimah.Alshammari 0b3fea230f monthly report 1 month ago
haroon amjad d202aa8423 Smartwatch integration started 1 month ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
1 month ago
tahaalam ac15ab26f5 graph changes for high and low 1 month ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
tahaalam fc0f98da1d calender reminder added 2 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
3 months ago
tahaalam 90128a812b call ambulance module design added. 3 months ago
faizatflutter 72d765e508 Design Updates 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
3 months ago
tahaalam da89c41925 lab result by hospital and translations are added 4 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 4 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 4 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 4 months ago
Haroon Amjad 1c2564a1e2 updates 4 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 4 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 4 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 4 months ago
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
4 months ago
Sultan khan fe36c2a1c1 auto sms 4 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
haroon amjad 6f745f3666 calendar implementation contd. 4 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
4 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 4 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 4 months ago
haroon amjad ccd29f0cf9 updates 4 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 4 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 4 months ago
aamir-csol 52fddc5323 login flow completion 4 months ago
haroon amjad d794787459 updates 4 months ago
faizatflutter b15ddd1713 completed till otp receiving 4 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
4 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
4 months ago
haroon amjad 2d5f2b1deb updates 4 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem d385d0362f merge changes 4 months ago
aamir-csol 3855ba276f calender & signup fixes. 4 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
4 months ago
faizatflutter 6e05ca15cf adding the login function 4 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
4 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 4 months ago