Commit Graph

1381 Commits (e13a13189c7752750702d868b2916b726965c99d)
 

Author SHA1 Message Date
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
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 49c454b132 fixes 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
Mohammad Aljammal 565dbf7c33 Merge branch 'sultan-patientapp' into 'development'
bug fix

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

See merge request Cloud_Solution/diplomatic-quarter!295
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
Mohammad Aljammal e5bcc5403a Merge branch 'fix_bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!294
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 256ffd05ea Merge branch 'fix_eye_balance' into 'development'
Fix eye balance

See merge request Cloud_Solution/diplomatic-quarter!293
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 3468f847d3 Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!291
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
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 4 years ago
haroon amjad 33e1bf8103 Jira fixes 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
haroon amjad accc39d972 jira bug fixes 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
Mohammad Aljammal a018eab316 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!288
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 0574161ad3 Merge branch 'fix_theme_issues' into 'development'
fix theme issues

See merge request Cloud_Solution/diplomatic-quarter!287
4 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 4 years ago
haroon amjad 8d16d0a69d Merge branch 'development' into Haroon 4 years ago
haroon amjad 12c4250654 home page ereferral fix 4 years ago
Mohammad Aljammal 7e37d6824e Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!285
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 573f5110f5 Merge branch 'development' into Haroon 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