hussam al-habibeh
|
01a56da151
|
merge conflict resolved
|
4 years ago |
hussam al-habibeh
|
141e650276
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
hussam al-habibeh
|
8c4af92832
|
pharmacy new design home
|
4 years ago |
haroon amjad
|
bbcba1fca0
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!548
|
4 years ago |
hussam al-habibeh
|
a5e7541394
|
new design pharmacy home
|
4 years ago |
hussam al-habibeh
|
af0316367d
|
Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
Elham Rababh
|
c5be1472e7
|
first step from product details
|
4 years ago |
Fatimah Alshammari
|
dbe74b3eb4
|
fix desing
|
4 years ago |
Fatimah Alshammari
|
bc49d0d7c0
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
db3ea448f6
|
fix design
|
4 years ago |
Elham Rababh
|
c6be53d800
|
first step from product details
|
4 years ago |
Elham Rababh
|
a71e7e4075
|
first step from product details
|
4 years ago |
haroon amjad
|
38aa0fac61
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
LiveCare permissions
See merge request Cloud_Solution/diplomatic-quarter!547
|
4 years ago |
haroon amjad
|
fe7baeab3c
|
LiveCare permissions
|
4 years ago |
haroon amjad
|
39190681c6
|
Updates
|
4 years ago |
haroon amjad
|
078300168c
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!546
|
4 years ago |
haroon amjad
|
e3b7069aa2
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/webRTC/call_page.dart
# lib/pages/webRTC/signaling.dart
|
4 years ago |
haroon amjad
|
2274c6affe
|
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!531
|
4 years ago |
haroon amjad
|
8b1733e917
|
no message
|
4 years ago |
haroon amjad
|
003375b12f
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!543
|
4 years ago |
haroon amjad
|
68b443905e
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!544
|
4 years ago |
haroon amjad
|
d291c4ef2b
|
Merge branch 'login_design_sikander' into 'development_new_design_2.0'
video call improvements for android
See merge request Cloud_Solution/diplomatic-quarter!545
|
4 years ago |
Elham Rababh
|
34596163d1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
Sikander Saleem
|
4518a26ff1
|
video call improvement.
|
4 years ago |
Fatimah Alshammari
|
127096ec04
|
fixed wishlist design
|
4 years ago |
Fatimah Alshammari
|
21c315c1a3
|
fix wishlist issue
|
4 years ago |
hussam al-habibeh
|
e6fd5293ca
|
fix filited produvts API
|
4 years ago |
Fatimah Alshammari
|
7bbabd798a
|
fix issue
|
4 years ago |
Fatimah Alshammari
|
e640f41c35
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacies/widgets/ProductOrderItem.dart
|
4 years ago |
Fatimah Alshammari
|
12b20831df
|
fix app bar
|
4 years ago |
Elham Rababh
|
12e47aba82
|
fix as first step
|
4 years ago |
haroon amjad
|
998614cfe7
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!541
|
4 years ago |
haroon amjad
|
816dfe4a12
|
Pharmacy fixes
|
4 years ago |
haroon amjad
|
2c198ed224
|
no message
|
4 years ago |
haroon amjad
|
a88889ec1d
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details
See merge request Cloud_Solution/diplomatic-quarter!540
|
4 years ago |
Elham Rababh
|
6439fe264a
|
small fix in order details
|
4 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
|
4 years ago |
haroon amjad
|
51915be699
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!538
|
4 years ago |
Fatimah Alshammari
|
2992ca4f70
|
fix translation
|
4 years ago |
Fatimah Alshammari
|
bd93395d0f
|
fix order details issue
|
4 years ago |
Fatimah Alshammari
|
c60cf72640
|
fix lakum design
|
4 years ago |
Fatimah Alshammari
|
5ae7471d3e
|
fix issue
|
4 years ago |
Fatimah Alshammari
|
7b44f3487f
|
fix lakum design
|
4 years ago |
Fatimah Alshammari
|
e9a86b4e1c
|
fix lakum
|
4 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
|
4 years ago |
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
4 years ago |
devmirza121
|
f9e98c5fa4
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
7d2a6c794b
|
Clinic Search Dialog
|
4 years ago |
haroon amjad
|
e683fe18b8
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!537
|
4 years ago |
haroon amjad
|
4b446bb6d0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |