371 Commits (2665e4cd0c33422d46d274c995395ff2499a2994)

Author	SHA1	Message	Date
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
Sikander Saleem	907d90b987	login ui and forgot password ui added.	3 years ago
Mirza.Shafique	b0dfbef52a	Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart	3 years ago
Mirza.Shafique	d37f225c1b	Home page 1.2	3 years ago
Sikander Saleem	3707b13986	login type ui & icons added.	3 years ago
Mirza.Shafique	090556f4d1	Merge branch 'mirza_home_page' into development_new_design_2.0	3 years ago
Mirza.Shafique	5dc88f51c3	Home Page 1.0	3 years ago
Sikander Saleem	8b2feb03ea	last login and login options ui.	3 years ago
Mirza.Shafique	58d5734f1a	Bug Fix: 873, 878 to 881	3 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
Zohaib Iqbal Kambrani	c7c96f913f	no message	4 years ago
Mohammad Aljammal	9a850d0ca3	fix advance payment	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	60b1688bb4	chatbot	4 years ago
Sultan Khan	9bfd725e4f	bug fixes	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
haroon amjad	b9a12341d5	updates & fixes	4 years ago
Mohammad Aljammal	861dba9a94	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online ... Conflicts: lib/config/localized_values.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	ec401d4848	Done Ed online	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
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
Sultan Khan	1a35fe37b6	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Fatimah Alshammari	42bf76f712	Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/config/config.dart # lib/core/service/parmacyModule/parmacy_module_service.dart # lib/pages/pharmacies/product_detail.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart	4 years ago
Zohaib Iqbal Kambrani	15ec3ec9b9	Translation Track Driver, enhancement, initial camera	4 years ago
Zohaib Iqbal Kambrani	63663f1b24	Track Delivery Driver Completed	4 years ago
Fatimah Alshammari	ac32ba998c	fixed order isuee	4 years ago
Mohammad Aljammal	e6da54c201	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	20ad10b9dc	Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy ... Conflicts: lib/config/localized_values.dart lib/core/service/client/base_app_client.dart lib/uitl/translations_delegate_base.dart	4 years ago
Mohammad Aljammal	8899bdf460	Done Prescription Delivery Address	4 years ago
mosazaid	d02b74142a	Merge branch 'development' into fix-pharmacy ... # Conflicts: # lib/core/service/client/base_app_client.dart	4 years ago
mosazaid	1a45f99606	some fixes on pharmacy	4 years ago
haroon amjad	5e8e3806d6	Covid Drive-Thru implemented	4 years ago
Sultan Khan	144ef52c70	Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp	4 years ago
Sultan Khan	b3e6c4efda	voice command changes	4 years ago
Mohammad Aljammal	0098345d05	add Prescription Delivery Address Page amd fix the Authentication Pharmacy	4 years ago
mosazaid	b70c7d7d05	fix pharmacy auth	4 years ago
Mohammad Aljammal	29f4e6acb6	Merge branch 'hmg-services-fixing' into 'development' ... Hmg services fixing See merge request Cloud_Solution/diplomatic-quarter!262	4 years ago
haroon amjad	b6c617888b	Merge branch 'development' into Haroon ... # Conflicts: # lib/config/localized_values.dart	4 years ago