Elham Rababh
|
f85c359cf4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
Elham Rababh
|
69df61afb1
|
remove footer from pharmacy pages
|
5 years ago |
Mohammad Aljammal
|
d9fabbab17
|
Fix feedback
|
5 years ago |
hussam al-habibeh
|
b9d4195e20
|
Blood pressure translation issue
|
5 years ago |
Sultan khan
|
3c2a89cd8e
|
Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and sugar blood
See merge request Cloud_Solution/diplomatic-quarter!354
|
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
|
0a3c44b5e8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Elham Rababh
|
8626b4f269
|
first step from add footer for all pages
|
5 years ago |
haroon amjad
|
e28fdaade1
|
Dental Invoices implementation completed
|
5 years ago |
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
5 years ago |
hussam al-habibeh
|
d3868844de
|
Medication availability
|
5 years ago |
haroon amjad
|
709877b5f1
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
|
5 years ago |
haroon amjad
|
90db04cee1
|
Jira Fixes
|
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 |
Sultan Khan
|
c9fe036b99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
hussam al-habibeh
|
146fc5d2b2
|
PAP-777
|
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
|
d88e3faa6b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
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
|
5 years ago |
Sultan Khan
|
8766a69928
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
446f86dbcf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Elham Rababh
|
5d05b09345
|
PAP-712 : fixes on Blood sugar
|
5 years ago |
Sultan Khan
|
c88bea4461
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
9acb5b087d
|
bug fixes
|
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 |
Sultan khan
|
9196367da4
|
Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
|
5 years ago |
Mirza.Shafique
|
2fda47baf6
|
Medical Profile Buttons Lock
|
5 years ago |
Sultan Khan
|
3c2539d5b9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
14ef096c32
|
changes and fixes
|
5 years ago |
Haroon Amjad
|
fde658fd5d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
5 years ago |
Mirza.Shafique
|
e934e7cd2c
|
Merge Fix
|
5 years ago |
haroon amjad
|
0d2a91c124
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
hussam al-habibeh
|
8d8fbc3edc
|
jira bugs
|
5 years ago |
Sultan khan
|
15f620d720
|
Merge branch 'Jul_fixes' into 'development'
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
|
5 years ago |
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
5 years ago |
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
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 |