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
|
a67e320a8e
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
|
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 |
mosazaid
|
2e33c2b240
|
fix bugs
|
5 years ago |
Elham Rababh
|
5d05b09345
|
PAP-712 : fixes on Blood sugar
|
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 |
Sultan khan
|
f54b9a63aa
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
|
5 years ago |
Mirza.Shafique
|
2fda47baf6
|
Medical Profile Buttons Lock
|
5 years ago |
Zohaib Iqbal Kambrani
|
dbf525c484
|
no message
|
5 years ago |
Haroon Amjad
|
213d104d57
|
Covid test procedure selection implemented
|
5 years ago |
Sultan Khan
|
14ef096c32
|
changes and fixes
|
5 years ago |
Mirza.Shafique
|
b31813770e
|
Check-In NFC done
|
5 years ago |
Mirza.Shafique
|
fb0a67e5bd
|
PAP 828 and 792 issue fix
|
5 years ago |
haroon amjad
|
7cf66934bc
|
Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
Sultan khan
|
f048f5229b
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!321
|
5 years ago |
Mirza.Shafique
|
58d5734f1a
|
Bug Fix: 873, 878 to 881
|
5 years ago |
Sultan Khan
|
85e803651c
|
permission issue fixed
|
5 years ago |
Sultan Khan
|
da2df9b348
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
bcabd81f88
|
BUG FIXES
|
5 years ago |
Haroon Amjad
|
e13a13189c
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
865afd7761
|
fix bugs
|
5 years ago |
Mohammad Aljammal
|
25d5105caf
|
Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
|
5 years ago |
Elham Rababah
|
2a47564c37
|
PAP-607: fix issue
|
5 years ago |
Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
5 years ago |
Sultan Khan
|
8c9c309abb
|
bug fixes
|
5 years ago |
Zohaib Iqbal Kambrani
|
c7c96f913f
|
no message
|
5 years ago |
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
5 years ago |
haroon amjad
|
353a5157f2
|
fixes
|
5 years ago |
Mohammad Aljammal
|
9a850d0ca3
|
fix advance payment
|
5 years ago |
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
5 years ago |
haroon amjad
|
49c454b132
|
fixes
|
5 years ago |
mosazaid
|
b623bd0dce
|
Merge branch 'development' into fix_bugs
|
5 years ago |
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
5 years ago |
Zohaib Iqbal Kambrani
|
b91ce441e2
|
Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
5 years ago |
haroon amjad
|
9c1fdf96f4
|
Merge branch 'development' into Haroon
|
5 years ago |
haroon amjad
|
accc39d972
|
jira bug fixes
|
5 years ago |
Sultan Khan
|
60b1688bb4
|
chatbot
|
5 years ago |
Sultan Khan
|
9bfd725e4f
|
bug fixes
|
5 years ago |
Sultan Khan
|
0445011e53
|
bug fixes
|
5 years ago |
haroon amjad
|
454957ebba
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
|
5 years ago |
Sultan Khan
|
616212828d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
5 years ago |
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
5 years ago |