Commit Graph

326 Commits (ff55ae1908d13d0dee8dd2d4739f56eeb2ae73e6)

Author SHA1 Message Date
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 5 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 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
5 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 5 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sultan Khan 7c398ba40d bug fix 5 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 5 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 473315f8a1 improvements 5 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 53e4815866 no auth ui modifications 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 5 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 5 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
5 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Elham Rababh c6a68083a4 PAP-667: fix blood type 5 years ago
Elham Rababh c14adccb49 PAP-667: add unit to home page 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
Sultan Khan 3d6858d0ec bug fixes 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
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
haroon amjad b9a12341d5 updates & fixes 5 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
5 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
5 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
haroon amjad d8e11f7187 Merge branch 'development' into Haroon 5 years ago