haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
3 years ago |
haroon amjad
|
72e2707d4b
|
updates
|
3 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
3 years ago |
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
3 years ago |
haroon amjad
|
32edb2e71e
|
updates
|
3 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
3 years ago |
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
3 years ago |
haroon amjad
|
cbf49e31a1
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
3 years ago |
haroon amjad
|
2a343db335
|
updates
|
3 years ago |
haroon amjad
|
736edad018
|
OB Gyne appo updates
|
3 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
3 years ago |
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
3 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
3 years ago |
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
3 years ago |
haroon amjad
|
a6c6651363
|
Updates & fixes
|
3 years ago |
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
3 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
3 years ago |
haroon amjad
|
7f5f3ababe
|
Registration fix
|
3 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
3 years ago |
haroon amjad
|
e45c2c5652
|
covid & pharmacy updates
|
3 years ago |
haroon amjad
|
eb6b0aefc0
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!580
|
3 years ago |
haroon amjad
|
7dbc00a864
|
ancillary orders update
|
3 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
3 years ago |
Fatimah Alshammari
|
f83adbc6ff
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
3 years ago |
Fatimah Alshammari
|
0b21252ae7
|
fix category issue
|
3 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
3 years ago |
haroon amjad
|
e53ba65ddd
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
3 years ago |
Fatimah Alshammari
|
0985436a10
|
fix translation issue
|
3 years ago |
haroon amjad
|
4e3d99b007
|
Updates & fixes
|
3 years ago |
haroon amjad
|
6d88607631
|
Updates & fixes
|
3 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
3 years ago |
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
3 years ago |
haroon amjad
|
2670d0be57
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
3 years ago |
Fatimah Alshammari
|
b09b1e4732
|
six issues
|
3 years ago |
Fatimah Alshammari
|
ff7146e259
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
# lib/pages/pharmacy/pharmacyContacts.dart
|
3 years ago |
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
3 years ago |
haroon amjad
|
207525e31a
|
Fixes
|
3 years ago |
Fatimah Alshammari
|
a55ca33c1b
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
# lib/widgets/pharmacy/product_tile.dart
|
3 years ago |
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
3 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
3 years ago |
haroon amjad
|
14b0c4c125
|
Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design
See merge request Cloud_Solution/diplomatic-quarter!550
|
3 years ago |
Elham Rababh
|
d6eeb02c91
|
fix on design
|
3 years ago |
haroon amjad
|
d1fcdcc898
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
3 years ago |
Elham Rababh
|
c6be53d800
|
first step from product details
|
3 years ago |
Elham Rababh
|
a71e7e4075
|
first step from product details
|
3 years ago |
Elham Rababh
|
34596163d1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
3 years ago |
Elham Rababh
|
12e47aba82
|
fix as first step
|
3 years ago |
haroon amjad
|
17d569216d
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!539
|
3 years ago |
Fatimah Alshammari
|
d25f888c3e
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
3 years ago |
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
3 years ago |
devmirza121
|
f9e98c5fa4
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
devmirza121
|
7d2a6c794b
|
Clinic Search Dialog
|
3 years ago |
haroon amjad
|
4b446bb6d0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
Sikander Saleem
|
407fb81038
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 years ago |
Sikander Saleem
|
7df0fc59df
|
laser images change & offer and packages
|
3 years ago |
haroon amjad
|
5f0985adaa
|
Updates
|
3 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
3 years ago |
haroon amjad
|
68294690a1
|
prescription reminders added
|
3 years ago |
devmirza121
|
f3b7a5c318
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
devmirza121
|
69b1dd6533
|
Medical Reminder
|
3 years ago |
Sikander Saleem
|
044c442ce0
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/parent_categorise_page.dart
|
3 years ago |
Sikander Saleem
|
5a8c887117
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 years ago |
Sikander Saleem
|
00f63cd288
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Sikander Saleem
|
014074c414
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
3 years ago |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
3 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
3 years ago |
haroon amjad
|
f4ccecc1af
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue
See merge request Cloud_Solution/diplomatic-quarter!516
|
3 years ago |
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
3 years ago |
haroon amjad
|
d4e71fd8ec
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart back button
See merge request Cloud_Solution/diplomatic-quarter!514
|
3 years ago |
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
3 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
3 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
3 years ago |
hussam al-habibeh
|
1a382bfc80
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/config/config.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/sub_categorise_page.dart
|
3 years ago |
haroon amjad
|
a74a6d5bc8
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!499
|
3 years ago |
devmirza121
|
6575456d3b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
3 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
3 years ago |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
3 years ago |
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
3 years ago |
devmirza121
|
a131f24952
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
# lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
# lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
devmirza121
|
1d1708bdcc
|
Health Calculator 4.0
|
3 years ago |
hussam al-habibeh
|
b2b786d157
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
3 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
3 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
3 years ago |
haroon amjad
|
ea745f1b9f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
haroon amjad
|
efe8dea9a9
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!489
|
3 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
3 years ago |
devmirza121
|
6225f2468d
|
Health Calculator 3.0
|
3 years ago |
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
3 years ago |
devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
3 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
3 years ago |
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
3 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
3 years ago |
haroon amjad
|
e1e31de818
|
Lakum fixes
|
3 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
3 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
3 years ago |
Fatimah Alshammari
|
28678633e7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
3 years ago |
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
3 years ago |
haroon amjad
|
585e26b091
|
Registration fix
|
3 years ago |
Sikander Saleem
|
d6a5f68312
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
3 years ago |
Sikander Saleem
|
cd81f05a8d
|
laser clinic design (cont.)
|
3 years ago |
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
3 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
3 years ago |
Mohammad Aljammal
|
f9e33e7212
|
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
|
3 years ago |
Mohammad Aljammal
|
60d2496f0a
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!472
|
3 years ago |
Fatimah Alshammari
|
9cececf3f1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
3 years ago |
Elham Rababh
|
d486b76116
|
fix merge issue
|
3 years ago |
Elham Rababh
|
c97c39ea11
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
Conflicts:
lib/config/config.dart
lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
|
3 years ago |
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
3 years ago |
haroon amjad
|
0c2e3f772b
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!468
|
3 years ago |
Mirza.Shafique
|
69db41364f
|
icon fixs
|
3 years ago |
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
3 years ago |
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
3 years ago |
Elham Rababh
|
616748dc6f
|
fix proceed button
|
3 years ago |
Zohaib Iqbal Kambrani
|
94a5cac27d
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Zohaib Iqbal Kambrani
|
9d71793e88
|
no message
|
3 years ago |
Mirza.Shafique
|
f56ae8ff5b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
3 years ago |
Sikander Saleem
|
8c27773f7f
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
Sikander Saleem
|
40c63ae53b
|
dialog ui changes in wallet & improvements.
|
3 years ago |
Mirza.Shafique
|
a805273049
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
3 years ago |
haroon amjad
|
2a212149ed
|
Health converters UI done
|
3 years ago |
haroon amjad
|
73822300f9
|
Health Calculators APIs updated
|
3 years ago |
haroon amjad
|
7123ed34ab
|
Translation updates
|
3 years ago |
Mirza.Shafique
|
cacdd5907c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
Mirza.Shafique
|
fd26a59b2d
|
live care design 1.0
|
3 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
3 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
4c5b9b4244
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
Translation update
Fixes & updates
Blood donation fixes
Pharmacy Payment method design fix, Blood Donation fix
improvements
blood donation dialog change & improvements.
Pharmacy updates
Pharmacy prescriptions page design
LiveCare design fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
3 years ago |
haroon amjad
|
5474ecf2cc
|
Translation update
|
3 years ago |
Fatimah Alshammari
|
428791c725
|
fixed design
|
3 years ago |
Fatimah Alshammari
|
5e75860d43
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
# lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
|
3 years ago |
Fatimah Alshammari
|
1089ce3aa3
|
Updates
|
3 years ago |
haroon amjad
|
2cff7c3246
|
LiveCare design fixes
|
3 years ago |
haroon amjad
|
6f92a093ab
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
3 years ago |
haroon amjad
|
e58b925382
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
|
3 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
3 years ago |
Zohaib Iqbal Kambrani
|
8b1ac05012
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
app bar back icon issue
improvements
emergency nearest ui changes
Zoom Avatar implementation
no message
Child Vaccine 3
register
register page
Working on Health data
Child Vaccine 2
registration
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
registration done
Child Vaccine 1.0
In App Review
In App Review
oder log merge fix
design fixes 3
Chart fix & In-App update implemented
design fixes 1.1
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
3 years ago |
haroon amjad
|
be91844868
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
30c6f1dedb
|
Updates
|
3 years ago |
Sikander Saleem
|
7641da8122
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/hospital_location.dart
|
3 years ago |
Sikander Saleem
|
7c4edf971a
|
emergency nearest ui changes
|
3 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
3 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
3 years ago |
haroon amjad
|
d409875741
|
Smartwatch updates
|
3 years ago |
haroon amjad
|
b52c719351
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
1f077f71f8
|
no message
|
3 years ago |
Mirza.Shafique
|
957ff9039b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
Mirza.Shafique
|
1a6802ce24
|
Child Vaccine 3
|
3 years ago |
haroon amjad
|
5287260b85
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
Sultan Khan
|
c14f40dae2
|
register page
|
3 years ago |
haroon amjad
|
983fb55747
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
haroon amjad
|
2032053cb7
|
Working on Health data
|
3 years ago |
haroon amjad
|
2062b96652
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
3 years ago |
Sultan Khan
|
a59c60f79a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
Sultan Khan
|
496c6ce32e
|
registration done
|
3 years ago |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
3 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
3 years ago |
haroon amjad
|
75d3751719
|
Offers API
|
3 years ago |
haroon amjad
|
494b1f221d
|
Updates & fixes
|
3 years ago |
Sikander Saleem
|
14ccae993e
|
my tracker tabs switching issue fixed.
|
3 years ago |
haroon amjad
|
1dcfe44e96
|
Translations
|
3 years ago |
Mirza.Shafique
|
4cf9a9b2c2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
Mirza.Shafique
|
3dbef4095f
|
Payment page design
|
3 years ago |
Sikander Saleem
|
ba4792cd38
|
merge improvements.
|
3 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
3 years ago |
haroon amjad
|
5d44fff28d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
3 years ago |
Mirza.Shafique
|
ab6f7b8915
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
Mirza.Shafique
|
eeaf7d9d2f
|
HMG Services Detail View
|
3 years ago |
Sikander Saleem
|
f13871de9a
|
find us and prescription availability hospital location ui changes,
|
3 years ago |
haroon amjad
|
cf7291e379
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
haroon amjad
|
03882c166c
|
Translation & UI updates
|
3 years ago |
haroon amjad
|
90843252c3
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
# lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
3 years ago |
haroon amjad
|
6d3ead24e1
|
localisation update
|
3 years ago |
Sultan Khan
|
a31f55aaa7
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
Sultan Khan
|
4780039cc7
|
family file change
|
3 years ago |
Mirza.Shafique
|
e1b79ef5c1
|
E-Refreal design
|
3 years ago |
haroon amjad
|
2db050a228
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
3 years ago |
Sikander Saleem
|
0b4305de03
|
all dialog changes and improvements (cont).
|
3 years ago |
Sultan Khan
|
448a3aaa48
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
Sultan Khan
|
881644a22e
|
family files changes
|
3 years ago |
Sikander Saleem
|
ae85f75e81
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/feedback/status_feedback_page.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
3 years ago |
Sultan khan
|
f5b17444fe
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family
See merge request Cloud_Solution/diplomatic-quarter!441
|
3 years ago |