Commit Graph

341 Commits (6ee56cba0da69b10fad1f98af47ecda42dbc0972)

Author SHA1 Message Date
Sikander Saleem bb20d65b40 lab result detail screen. 3 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 3 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 3 years ago
Sikander Saleem f482595d6b merge improvements. 3 years ago
Mirza.Shafique 4ebf5f900b improvements. 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 3 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 3 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 3 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 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
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 3 years ago
haroon amjad 7cf66934bc Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
Sultan Khan 85e803651c permission issue fixed 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
Haroon Amjad e13a13189c Merge branch 'development' into Haroon
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 865afd7761 fix bugs 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
Elham Rababah 2a47564c37 PAP-607: fix issue 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 4 years ago
Sultan Khan 8c9c309abb bug fixes 4 years ago
haroon amjad 353a5157f2 fixes 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
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 4 years ago
mosazaid e5474b3062 fix perscription pages bugs 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
Sultan Khan 0445011e53 bug fixes 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
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 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