Commit Graph

1072 Commits (36d422c7aa0ead5bd7db6bb9ecb233a32b201db6)

Author SHA1 Message Date
Elham Rababah 36d422c7aa PAP-563: fix pickup location from hospital 5 years ago
Elham Rababah aa1c92c142 PAP-562: fix status 5 years ago
Elham Rababah 8c5b3742b6 PAP-643: fix button 5 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 5 years ago
Elham Rababah 1f70d086e0 PAP-634: Add search button. 5 years ago
Elham Rababah 9588b134fb PAP-645: resized calculator 5 years ago
Mohammad Aljammal f4f4a0977e Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!307
5 years ago
Fatimah Alshammari ef53338971 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari faa8a13778 fixed isuue-product details 5 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
5 years ago
Sultan Khan 3a8b889b74 bug fixes 5 years ago
Sultan Khan 724e0098fb bug fixes 5 years ago
Sultan Khan 1cd4d93488 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 5 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 3d6858d0ec bug fixes 5 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 5 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 5 years ago
Mohammad Aljammal 6fa79ef8d0 Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530

See merge request Cloud_Solution/diplomatic-quarter!300
5 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 5 years ago
Elham Rababah 1b393d6601 PAP-559: remove the km 5 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 5 years ago
hussam al-habibeh 1ce10f4d78 jira bug PAP-530 5 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
5 years ago
Mohammad Aljammal dcc98a35ac Merge branch 'fix_advance_payment' into 'development'
fix advance payment

See merge request Cloud_Solution/diplomatic-quarter!299
5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Sultan Khan 8e255f1f22 bug fix 5 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 5 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 1b770420be bug fixes 5 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 5 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Fatimah Alshammari 39daaa16a7 added buttens in categories page 5 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
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 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
hussam al-habibeh a6ec7326b2 jira bugs 5 years ago