Sultan Khan
|
c9fe036b99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
 Sikander Saleem
|
a5d40f090a
|
improvements-test
|
3 years ago |
hussam al-habibeh
|
146fc5d2b2
|
PAP-777
|
3 years ago |
Mirza.Shafique
|
a20185b2b9
|
Home page 1.4 (Homepage changes)
|
3 years ago |
|
hussam al-habibeh
|
6ea06ce442
|
PAP-729
|
3 years ago |
|
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
3 years ago |
Elham Rababh
|
8b8e239d3f
|
fix button
|
3 years ago |
|
Elham Rababh
|
b01961e45f
|
fix translate issues
|
3 years ago |
|
Sultan Khan
|
d88e3faa6b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
Sultan khan
|
772dcba287
|
Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
See merge request Cloud_Solution/diplomatic-quarter!338
|
3 years ago |
|
Sultan Khan
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Elham Rababh
|
7ad4e03c1a
|
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
|
3 years ago |
Haroon Amjad
|
47e521fe1d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
3 years ago |
|
Sultan Khan
|
8766a69928
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
hussam al-habibeh
|
d5c76b5400
|
jira bugs
|
3 years ago |
|
hussam al-habibeh
|
6dc0d89f61
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
|
3 years ago |
|
hussam al-habibeh
|
981e78936e
|
jira bugs
|
3 years ago |
|
Sultan Khan
|
446f86dbcf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Elham Rababh
|
5d05b09345
|
PAP-712 : fixes on Blood sugar
|
3 years ago |
|
Sultan Khan
|
c88bea4461
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
9acb5b087d
|
bug fixes
|
3 years ago |
|
Elham Rababh
|
52816a9cfe
|
PAP-723 : system should display the empty graph in the blood pressure screen.
|
3 years ago |
|
Elham Rababh
|
f824063e82
|
PAP-726 : fix show Arabic values for the select Arm
|
3 years ago |
|
Elham Rababh
|
f92567f877
|
PAP-718 : fix show data after save
|
3 years ago |
|
Sultan khan
|
9196367da4
|
Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
|
3 years ago |
|
Mirza.Shafique
|
2fda47baf6
|
Medical Profile Buttons Lock
|
3 years ago |
|
Sultan Khan
|
3c2539d5b9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
3 years ago |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
Haroon Amjad
|
fde658fd5d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
Mirza.Shafique
|
e934e7cd2c
|
Merge Fix
|
3 years ago |
haroon amjad
|
0d2a91c124
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
|
hussam al-habibeh
|
8d8fbc3edc
|
jira bugs
|
3 years ago |
|
Sultan khan
|
15f620d720
|
Merge branch 'Jul_fixes' into 'development'
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
|
3 years ago |
|
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
3 years ago |
|
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
3 years ago |
|
Sultan khan
|
924f9bedc0
|
Merge branch 'bug_fixing' into 'development'
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
|
3 years ago |
|
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
3 years ago |
|
Sikander Saleem
|
38f134b6ff
|
Bug PAP-884 fixed, email was not updating.
|
3 years ago |
|
hussam al-habibeh
|
446021eb90
|
adding doctor list to health calculator
|
3 years ago |
|
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
3 years ago |
|
Sikander Saleem
|
b2e9060c3f
|
Bug PAP-877 fixed, blood tracker exception.
|
3 years ago |
|
Elham Rababh
|
4217fc0826
|
PAP-685: fix issue
|
3 years ago |
Fatimah Alshammari
|
b98d8b3a46
|
fixed prescription issue
|
4 years ago |
|
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
Mohammad Aljammal
|
9a850d0ca3
|
fix advance payment
|
4 years ago |
|
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
mosazaid
|
b623bd0dce
|
Merge branch 'development' into fix_bugs
|
4 years ago |
|
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
4 years ago |
|
Mohammad Aljammal
|
7c1fd8043b
|
fix chart and eye and balance
|
4 years ago |
|
haroon amjad
|
9c1fdf96f4
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
accc39d972
|
jira bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
b36e00d2a5
|
fix the line chart issues
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
Mohammad Aljammal
|
e6da54c201
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
haroon amjad
|
5e8e3806d6
|
Covid Drive-Thru implemented
|
4 years ago |
|
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
|
haroon amjad
|
ba10014b46
|
Merge branch 'development' into Haroon
|
4 years ago |
|
Mohammad Aljammal
|
0098345d05
|
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
|
4 years ago |
|
haroon amjad
|
83cca264f1
|
Merge branch 'LamaHerbish' into Haroon
|
4 years ago |
HMG\Lama.Herbish
|
031be1ac56
|
fixes
|
4 years ago |
|
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
|
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Mohammad Aljammal
|
3e441c55b2
|
fix bottom nav bar
|
4 years ago |
|
Mohammad Aljammal
|
9d8c1ddf63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
484cca086e
|
fix my my Trackers
|
4 years ago |
|
haroon amjad
|
7c538b350f
|
LiveCare Scheduling finalized, Appointments in ToDo list categorized
|
4 years ago |
|
Mohammad Aljammal
|
db2376f50c
|
fix blood and weight on my trackers
|
4 years ago |
|
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
haroon amjad
|
6945230965
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
|
mosazaid
|
38d52b52c8
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
|
4 years ago |
|
mosazaid
|
174534d8a5
|
fix Blood donation functionality and design
|
4 years ago |
|
Mohammad Aljammal
|
f883e1bd78
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
|
Mohammad Aljammal
|
0b1014a91c
|
fix blood sugar service on my tracker
|
4 years ago |
|
Sultan Khan
|
c65983bfdb
|
code merged
|
4 years ago |
|
mosazaid
|
3a45239059
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
4 years ago |
|
Mohammad Aljammal
|
200334d8f8
|
Fix ER service
|
4 years ago |
|
Mohammad Aljammal
|
b63025a9b3
|
return CMC HHC
|
4 years ago |
|
Mohammad Aljammal
|
30ddea6419
|
hot fixing
|
4 years ago |
|
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
4 years ago |
|
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
952e106531
|
return privilege
|
4 years ago |
|
Mohammad Aljammal
|
f77d2b497e
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
18dad434a0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
|
4 years ago |
|
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
4 years ago |
|
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
|
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
4 years ago |
Mohammad Aljammal
|
5e29dff448
|
fix issues insurance and medical profile order
|
4 years ago |
|
Mohammad Aljammal
|
b9958acd53
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
4 years ago |
|
Mohammad Aljammal
|
4d8f42b517
|
fix issues vital sign issue
|
4 years ago |
|
Mohammad Aljammal
|
f6983c138a
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
4 years ago |
|
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 years ago |