Commit Graph

1381 Commits (e13a13189c7752750702d868b2916b726965c99d)
 

Author SHA1 Message Date
Haroon Amjad e13a13189c Merge branch 'development' into Haroon
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 81ce399e85 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!316
4 years ago
mosazaid 865afd7761 fix bugs 4 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
4 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 4 years ago
Mohammad Aljammal b37dd57804 Merge branch 'pharmacy-Fatima' into 'development'
fixed prescription issue

See merge request Cloud_Solution/diplomatic-quarter!313
4 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
4 years ago
Fatimah Alshammari b98d8b3a46 fixed prescription issue 4 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 4 years ago
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
Mohammad Aljammal 50f84f318a Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!309
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
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
Mohammad Aljammal bfc687d161 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!305
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
Mohammad Aljammal 2a484ec857 Merge branch 'ZohaibIqbalKambrani' into 'development'
Huawei Location Implementation -> LocationUtils.getCurrentLocation((coordinates){})

See merge request Cloud_Solution/diplomatic-quarter!302
4 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 4 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 353a5157f2 fixes 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
haroon amjad a6a9a92c6f JIRA bug fixes 4 years ago