haroon amjad
|
9852811983
|
Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5
See merge request Cloud_Solution/diplomatic-quarter!586
|
4 years ago |
Zohaib Iqbal Kambrani
|
ff508de9f7
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Updates & fixes
# Conflicts: resolved
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
haroon amjad
|
aa36154764
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal
|
364ff3344a
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
a2efbf6494
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
81a3d1ce87
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
940a19d4d7
|
Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
ancillary orders update
Updates & fixes
fix category issue
fixes & updates
lakum fix
Updates & fixes
fix translation issue
Compare duplication fixed
Updates & fixes
Updates & fixes
fix compare issue
pharmacy fixes
fix categories & cantact design
pharmacy fixes
Updates & fixes
fix conflict
Updates & fixes
Updates & fixes
Login fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/BookAppointment/SearchResults.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
d974a7430c
|
Google Analytics as per e-Cense document
|
4 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
4 years ago |
haroon amjad
|
ceeb6c1bb7
|
Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!583
|
4 years ago |
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
2a22edfdd0
|
no message
|
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 |
haroon amjad
|
9674376163
|
Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Packages and offers fixes, HMG Internet work in progress,
See merge request Cloud_Solution/diplomatic-quarter!582
|
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
|
7f5f3ababe
|
Registration fix
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e45c2c5652
|
covid & pharmacy updates
|
4 years ago |
haroon amjad
|
eb6b0aefc0
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!580
|
4 years ago |
haroon amjad
|
7f34a1fe71
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
7dbc00a864
|
ancillary orders update
|
4 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
f83adbc6ff
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
0b21252ae7
|
fix category issue
|
4 years ago |
haroon amjad
|
4acdad0e99
|
fixes & updates
|
4 years ago |
haroon amjad
|
56b640ff91
|
Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!579
|
4 years ago |
haroon amjad
|
8f91d0a0dc
|
lakum fix
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e53ba65ddd
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
cd797123a3
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!578
|
4 years ago |
Fatimah Alshammari
|
55cc5dae4f
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
0985436a10
|
fix translation issue
|
4 years ago |
haroon amjad
|
28107f9a48
|
Compare duplication fixed
|
4 years ago |
haroon amjad
|
8c3b443f79
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
4e3d99b007
|
Updates & fixes
|
4 years ago |
haroon amjad
|
bac6774534
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!576
|
4 years ago |
Fatimah Alshammari
|
e5f0f5777b
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
# lib/services/pharmacy_services/product_detail_service.dart
|
4 years ago |
haroon amjad
|
1fc45e3f7c
|
Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!577
|
4 years ago |
haroon amjad
|
6d88607631
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
9740f88e6b
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
57d10d9e1f
|
fix compare issue
|
4 years ago |
haroon amjad
|
1f19af01c4
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
c175139a29
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
0ac937aa7d
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!575
|
4 years ago |
Fatimah Alshammari
|
71a28e2ed6
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
cc783045bb
|
fix categories & cantact design
|
4 years ago |
haroon amjad
|
3fcad86ef3
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
5ae5f75b4f
|
Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!574
|
4 years ago |