haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
a6c6651363
|
Updates & fixes
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
haroon amjad
|
4acdad0e99
|
fixes & updates
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
7634c35e3d
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
# lib/widgets/input/text_field.dart
|
4 years ago |
Fatimah Alshammari
|
d7c3cb3dbc
|
fix conflict
|
4 years ago |
haroon amjad
|
c2b0326676
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
c8b5602d8e
|
flutter 2.8 improvements.
|
4 years ago |
Sikander Saleem
|
684add0090
|
merge improvements
|
4 years ago |
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
haroon amjad
|
d5b58c07ca
|
Smartwatch fixes
|
4 years ago |
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
haroon amjad
|
bb9aaf9945
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/availability_info.dart
|
4 years ago |
haroon amjad
|
207525e31a
|
Fixes
|
4 years ago |
Fatimah Alshammari
|
749b89b67d
|
fix issue
|
4 years ago |
haroon amjad
|
94aab4a737
|
Speech to text fix in iOS
|
4 years ago |
Fatimah Alshammari
|
a1b4e1c8a3
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
7ffb431454
|
added map luncher
|
4 years ago |
haroon amjad
|
302e9dbadd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
1b9e3b75bd
|
fix issue of navigation
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 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
|
4 years ago |
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
4 years ago |
haroon amjad
|
eb64962d7c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
b0ae08d6a5
|
updates & fixes
|
4 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
4 years ago |
Elham Rababh
|
8f044a635a
|
fix footer design
|
4 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
|
4 years ago |
haroon amjad
|
75423e5501
|
Updates
|
4 years ago |
Elham Rababh
|
d6eeb02c91
|
fix on design
|
4 years ago |
haroon amjad
|
d1fcdcc898
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
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 |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
Elham Rababh
|
c6be53d800
|
first step from product details
|
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 |
Fatimah Alshammari
|
127096ec04
|
fixed wishlist design
|
4 years ago |
Fatimah Alshammari
|
21c315c1a3
|
fix wishlist issue
|
4 years ago |
Sikander Saleem
|
407fb81038
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
4 years ago |
Sikander Saleem
|
7df0fc59df
|
laser images change & offer and packages
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
b596b1b61d
|
WebRTC and Packages Offer | Merge
|
4 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
|
4 years ago |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
4 years ago |