Mirza.Shafique
|
792bb4df0b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
Sikander Saleem
|
14ccae993e
|
my tracker tabs switching issue fixed.
|
5 years ago |
haroon amjad
|
90843252c3
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
# lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Sikander Saleem
|
ecb6315f9c
|
blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
|
5 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
5 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
5 years ago |
haroon amjad
|
803f5a786b
|
Blood pressure chart fix
|
5 years ago |
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
5 years ago |
Mirza.Shafique
|
4d372bffb2
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
5 years ago |
Mirza.Shafique
|
e788f09ed9
|
Show Chart Widget
|
5 years ago |
haroon amjad
|
46a572674f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
5 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
5 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
5 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
5 years ago |
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
5 years ago |
haroon amjad
|
4ac0845003
|
updates & fixes
|
5 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
Sultan Khan
|
c6404a2a0b
|
tracker services
|
5 years ago |
Sultan Khan
|
0086875d0d
|
Design Updated for tracker
|
5 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
5 years ago |
Elham Rababh
|
13737548bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
|
5 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
5 years ago |
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
5 years ago |
hussam al-habibeh
|
b9d4195e20
|
Blood pressure translation issue
|
5 years ago |
Elham Rababh
|
8629b62fcb
|
fix issue
|
5 years ago |
Elham Rababh
|
1568698b98
|
fix issues related to wight and sugar blood
|
5 years ago |
hussam al-habibeh
|
02df6f4d85
|
PAP-664
|
5 years ago |
hussam al-habibeh
|
60aaf2a31a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
|
5 years ago |
hussam al-habibeh
|
6ea06ce442
|
PAP-729
|
5 years ago |
Elham Rababh
|
8b8e239d3f
|
fix button
|
5 years ago |
Elham Rababh
|
b01961e45f
|
fix translate issues
|
5 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
|
5 years ago |
Elham Rababh
|
7ad4e03c1a
|
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
|
5 years ago |
hussam al-habibeh
|
d5c76b5400
|
jira bugs
|
5 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
|
5 years ago |
hussam al-habibeh
|
981e78936e
|
jira bugs
|
5 years ago |
Elham Rababh
|
5d05b09345
|
PAP-712 : fixes on Blood sugar
|
5 years ago |
Elham Rababh
|
52816a9cfe
|
PAP-723 : system should display the empty graph in the blood pressure screen.
|
5 years ago |
Elham Rababh
|
f824063e82
|
PAP-726 : fix show Arabic values for the select Arm
|
5 years ago |
Elham Rababh
|
f92567f877
|
PAP-718 : fix show data after save
|
5 years ago |
Mirza.Shafique
|
e934e7cd2c
|
Merge Fix
|
5 years ago |
hussam al-habibeh
|
8d8fbc3edc
|
jira bugs
|
5 years ago |
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
5 years ago |
Sultan khan
|
924f9bedc0
|
Merge branch 'bug_fixing' into 'development'
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
|
5 years ago |
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
5 years ago |
hussam al-habibeh
|
446021eb90
|
adding doctor list to health calculator
|
5 years ago |
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
5 years ago |