haroon amjad
|
ec646a7039
|
My Invoice fixes, Prescription page fixes
|
3 years ago |
|
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
3 years ago |
 Sikander Saleem
|
bdb7f29d4c
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/login/login.dart
|
3 years ago |
Mohammad Aljammal
|
8abbb04f02
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
|
3 years ago |
|
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
3 years ago |
Fatimah Alshammari
|
f3b545ff74
|
fixed products issues
|
3 years ago |
|
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
3 years ago |
|
Sikander Saleem
|
458dc2474b
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Sikander Saleem
|
5647ab75e5
|
improvements.
|
3 years ago |
|
Sikander Saleem
|
197e7d5742
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
3 years ago |
Mirza.Shafique
|
d865e97ce1
|
Vital Sings Home Page
|
3 years ago |
|
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Fatimah Alshammari
|
34ccb132dc
|
fixed issues
|
3 years ago |
|
Fatimah Alshammari
|
74d0826342
|
fixed issues
|
3 years ago |
|
Mirza.Shafique
|
66efbc1bac
|
Radiology Implementation
|
3 years ago |
haroon amjad
|
5c8e9f4e19
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
|
3 years ago |
|
haroon amjad
|
2242b78116
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
haroon amjad
|
e28fdaade1
|
Dental Invoices implementation completed
|
3 years ago |
Zohaib Iqbal Kambrani
|
f442cc251c
|
Pre Post Images Dental Doctor Profile
|
3 years ago |
|
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
3 years ago |
|
Sikander Saleem
|
56c0adaada
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
429fcb1e60
|
Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
3 years ago |
Sultan Khan
|
57864f949d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
|
3 years ago |
|
Sultan Khan
|
bd85854fa4
|
changes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
3 years ago |
|
haroon amjad
|
90db04cee1
|
Jira Fixes
|
3 years ago |
|
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
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 |
|
Mirza.Shafique
|
5dc88f51c3
|
Home Page 1.0
|
3 years ago |
|
Haroon Amjad
|
213d104d57
|
Covid test procedure selection implemented
|
3 years ago |
|
Sultan Khan
|
14ef096c32
|
changes and fixes
|
3 years ago |
|
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
4 years ago |
|
haroon amjad
|
6945230965
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
3fb522e15f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 years ago |
|
Mohammad Aljammal
|
519a474d41
|
fix live care label and vital sign data
|
4 years ago |
|
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
33956db22a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
haroon amjad
|
b55681a056
|
Working on steps tracking
|
4 years ago |
|
Mohammad Aljammal
|
a1e92e1fdd
|
fix merge issue
|
4 years ago |
|
Mohammad Aljammal
|
9fecf8e89f
|
fix insurance update
|
4 years ago |
|
haroon amjad
|
cf6686e413
|
Merge branch 'master' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
enadhilal
|
c22ca4e29e
|
Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 years ago |
|
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |