haroon amjad
|
709877b5f1
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
|
4 years ago |
haroon amjad
|
cf32d9f0ff
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
|
4 years ago |
haroon amjad
|
90db04cee1
|
Jira Fixes
|
4 years ago |
Sultan khan
|
69e957929d
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!343
|
4 years ago |
haroon amjad
|
5007064105
|
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 |
hussam al-habibeh
|
352fd912de
|
PAP-664
|
5 years ago |
hussam al-habibeh
|
29249dc9a9
|
PAP-664
|
5 years ago |
Sultan khan
|
b2349394ff
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!342
|
5 years ago |
Sultan Khan
|
e1750ce24c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
e5fb16ad69
|
langauge issue
|
5 years ago |
Sultan khan
|
08f7736030
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!341
|
5 years ago |
Sultan Khan
|
c9fe036b99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan khan
|
1898c12ec3
|
Merge branch 'fix_merge_issues' into 'development'
fix translate issues
See merge request Cloud_Solution/diplomatic-quarter!340
|
5 years ago |
Sultan Khan
|
7c398ba40d
|
bug fix
|
5 years ago |
hussam al-habibeh
|
146fc5d2b2
|
PAP-777
|
5 years ago |
haroon amjad
|
037a887e5c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
|
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
|
d6fd03b571
|
CONFIG
|
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
|
ba32a37a17
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
|
5 years ago |
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |
Sultan Khan
|
6534ca8349
|
Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan khan
|
54e1d51f18
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!337
|
5 years ago |
Zohaib Iqbal Kambrani
|
5f1d753895
|
no message
|
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 |
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
9b3a679948
|
Merge branch 'fix-bugs' into 'development'
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!336
|
5 years ago |
Mohammad Aljammal
|
b34402ffa8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!335
|
5 years ago |
Mohammad Aljammal
|
ed5079e3a0
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!334
|
5 years ago |
mosazaid
|
e9dbc4be7a
|
fix bugs
|
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 |
hussam al-habibeh
|
50d3a42743
|
fixing dashboard issue
|
5 years ago |
hussam al-habibeh
|
1ed76e91aa
|
fixing dashboard issue
|
5 years ago |
Sultan Khan
|
6442ce178d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan khan
|
a67e320a8e
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
|
5 years ago |
Sultan Khan
|
8766a69928
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan khan
|
d83ae18d7b
|
Merge branch 'pharmacy-bugs' into 'development'
jira bugs
See merge request Cloud_Solution/diplomatic-quarter!332
|
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 |
Zohaib Iqbal Kambrani
|
08e0ce52c8
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fix bugs
|
5 years ago |
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
5 years ago |
Mohammad Aljammal
|
4ac6bf628b
|
Merge branch 'fix-bugs' into 'development'
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!331
|
5 years ago |
Zohaib Iqbal Kambrani
|
882d5f090a
|
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
no message
|
5 years ago |