Mohammad Aljammal
|
268f0c8fa4
|
Merge branch 'fix-bugs' into 'development'
fix-design
See merge request Cloud_Solution/diplomatic-quarter!311
|
4 years ago |
|
Mohammad Aljammal
|
bd451f1283
|
Merge branch 'Apr-fixes' into 'development'
Apr fixes
See merge request Cloud_Solution/diplomatic-quarter!310
|
4 years ago |
mosazaid
|
116a4af845
|
fix-design
|
4 years ago |
Elham Rababah
|
36d422c7aa
|
PAP-563: fix pickup location from hospital
|
4 years ago |
|
Elham Rababah
|
aa1c92c142
|
PAP-562: fix status
|
4 years ago |
hussam al-habibeh
|
14939d3513
|
jira bugs (Health Calculator)
|
4 years ago |
|
Elham Rababah
|
8c5b3742b6
|
PAP-643: fix button
|
4 years ago |
|
Elham Rababah
|
aab33b3e03
|
PAP-609: fix text align
|
4 years ago |
Fatimah Alshammari
|
174e0d9673
|
Merge branch 'development' into pharmacy-Fatima
|
4 years ago |
|
Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
4 years ago |
|
Elham Rababah
|
1f70d086e0
|
PAP-634: Add search button.
|
4 years ago |
|
Elham Rababah
|
9588b134fb
|
PAP-645: resized calculator
|
4 years ago |
|
Mohammad Aljammal
|
f4f4a0977e
|
Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!307
|
4 years ago |
|
Fatimah Alshammari
|
ef53338971
|
Merge branch 'development' into pharmacy-Fatima
|
4 years ago |
|
Fatimah Alshammari
|
faa8a13778
|
fixed isuue-product details
|
4 years ago |
Sultan Khan
|
9adc4a974c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
8c9c309abb
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
1607aecb4a
|
Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page
See merge request Cloud_Solution/diplomatic-quarter!304
|
4 years ago |
|
Sultan Khan
|
3a8b889b74
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
724e0098fb
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
1cd4d93488
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
cd7845b1a4
|
bug fix
|
4 years ago |
|
Fatimah Alshammari
|
265d13b970
|
fixed an issue in recommended page
|
4 years ago |
Zohaib Iqbal Kambrani
|
c7c96f913f
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
e04421079e
|
Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!301
|
4 years ago |
|
Sultan Khan
|
0245875358
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
4 years ago |
|
Elham Rababah
|
96117fd191
|
PAP-625: add option “not classified”.
|
4 years ago |
|
Elham Rababah
|
6e7f62ca21
|
PAP-612: show ok and cancel options
|
4 years ago |
|
Mohammad Aljammal
|
6fa79ef8d0
|
Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530
See merge request Cloud_Solution/diplomatic-quarter!300
|
4 years ago |
|
Elham Rababah
|
66a9239698
|
PAP-558: Remove the choose Drop-off
|
4 years ago |
|
Elham Rababah
|
1b393d6601
|
PAP-559: remove the km
|
4 years ago |
|
Elham Rababah
|
5dd2e9986e
|
PAP-559: fix hospital_service
|
4 years ago |
|
hussam al-habibeh
|
1ce10f4d78
|
jira bug PAP-530
|
4 years ago |
|
Mohammad Aljammal
|
0a4f17dc88
|
Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!298
|
4 years ago |
|
Mohammad Aljammal
|
dcc98a35ac
|
Merge branch 'fix_advance_payment' into 'development'
fix advance payment
See merge request Cloud_Solution/diplomatic-quarter!299
|
4 years ago |
Mohammad Aljammal
|
9a850d0ca3
|
fix advance payment
|
4 years ago |
|
Fatimah Alshammari
|
bb622f248c
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy_categorise.dart
|
4 years ago |
|
Fatimah Alshammari
|
235fdfba54
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
|
4 years ago |
|
Fatimah Alshammari
|
71a393df68
|
fixed categories issue
|
4 years ago |
|
Mohammad Aljammal
|
008a39f043
|
Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!297
|
4 years ago |
|
Sultan Khan
|
8e255f1f22
|
bug fix
|
4 years ago |
|
Elham Rababah
|
86dda2b6d6
|
PAP-560: fix design
|
4 years ago |
|
Elham Rababah
|
a1ecfbf16a
|
PAP-560: fix design
|
4 years ago |
|
Elham Rababah
|
efb6ea68b8
|
PAP-561: fix design
|
4 years ago |
|
Sultan Khan
|
d4c3b03a5f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
1b770420be
|
bug fixes
|
4 years ago |
|
Elham Rababah
|
2e035e2c6b
|
PAP-576: fix design
|
4 years ago |
|
Elham Rababah
|
fa23c607bd
|
Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar
|
4 years ago |
|
mosazaid
|
b623bd0dce
|
Merge branch 'development' into fix_bugs
|
4 years ago |
|
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
4 years ago |
|
Fatimah Alshammari
|
39daaa16a7
|
added buttens in categories page
|
4 years ago |
|
Mohammad Aljammal
|
126fad61c0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
Conflicts:
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
53e4dfa99d
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
|
4 years ago |
|
Mohammad Aljammal
|
7c1fd8043b
|
fix chart and eye and balance
|
4 years ago |
|
Elham Rababah
|
7bdf31000f
|
PAP-356: fix chart design
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
a6ec7326b2
|
jira bugs
|
4 years ago |
|
hussam al-habibeh
|
f9b8191a5e
|
jira bugs
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
4 years ago |
|
Mohammad Aljammal
|
a613fe08e4
|
Merge branch 'fix_theme_issues' into 'development'
fix the line chart issues
See merge request Cloud_Solution/diplomatic-quarter!289
|
4 years ago |
|
Mohammad Aljammal
|
ced7761a32
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues
|
4 years ago |
|
Mohammad Aljammal
|
b36e00d2a5
|
fix the line chart issues
|
4 years ago |
|
Sultan Khan
|
60b1688bb4
|
chatbot
|
4 years ago |
|
Sultan Khan
|
9bfd725e4f
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
ca2a48e860
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
0445011e53
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
ad88f6de04
|
fix theme issues
|
4 years ago |
|
Sultan Khan
|
35c940a209
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
80d96ba785
|
Privilege issue fixed
|
4 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
|
4 years ago |
|
Sultan Khan
|
616212828d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
haroon amjad
|
db0fcd51cc
|
pharmacy updates
|
4 years ago |
|
haroon amjad
|
74671d2f25
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/order-preview-service.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
|
4 years ago |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
4 years ago |
|
mosazaid
|
ed1626f8ee
|
Merge branch 'development' into fix_order_checkout_payment
|
4 years ago |
|
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
4 years ago |
|
haroon amjad
|
ed3dba3eb3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
b9a12341d5
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
4dcb70d7eb
|
Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
|
4 years ago |
|
hussam al-habibeh
|
a534b1415e
|
products filtering fix
|
4 years ago |
|
Mohammad Aljammal
|
861dba9a94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
4 years ago |
|
Mohammad Aljammal
|
cacb6722b9
|
Merge branch 'pharmacy-bugs' into 'development'
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
|
4 years ago |
|
hussam al-habibeh
|
b39e88d9c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
|
4 years ago |
|
Sultan Khan
|
a6196d3c30
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
hussam al-habibeh
|
2723422bbf
|
daynimic listing
|
4 years ago |
|
Mohammad Aljammal
|
123b1de1a4
|
Merge branch 'pharmacy-bugs' into 'development'
hussam
See merge request Cloud_Solution/diplomatic-quarter!278
|
4 years ago |
|
Mohammad Aljammal
|
50a45528d1
|
Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
|
4 years ago |
|
hussam al-habibeh
|
299a1bed25
|
hussam
|
4 years ago |
|
hussam al-habibeh
|
790fbbcf6c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/pages/pharmacy_categorise.dart
|
4 years ago |
|
hussam al-habibeh
|
3af37a6a5c
|
hussam
|
4 years ago |
|
Fatimah Alshammari
|
8624d695dc
|
fixed order details
|
4 years ago |
|
Fatimah Alshammari
|
747763c4be
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
|
mosazaid
|
44287db553
|
bug-fixes
|
4 years ago |
|
Mohammad Aljammal
|
576181a72e
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
|
4 years ago |
|
Sultan Khan
|
6f68cf5a15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |