Commit Graph

481 Commits (882d5f090a598c9320c60413046c1f01dc712aac)

Author SHA1 Message Date
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
3 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
3 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
3 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
3 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 3 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 3 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 3 years ago
Sikander Saleem 7771b8f320 PAP-886 fixed, Insurance image button added. 3 years ago
Sikander Saleem db84090694 PAP-872 & PAP-593 fixed, Water addition was not visible. 3 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan bcabd81f88 BUG FIXES 3 years ago
Mohammad Aljammal bd451f1283 Merge branch 'Apr-fixes' into 'development'
Apr fixes

See merge request Cloud_Solution/diplomatic-quarter!310
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 9588b134fb PAP-645: resized calculator 4 years ago
Sultan Khan cd7845b1a4 bug fix 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
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
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
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 fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 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
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 4 years ago
Sultan Khan 9bfd725e4f bug fixes 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 e0ebb922ed pharmacy fixes 4 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 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
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
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
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
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
4 years ago