haroon amjad
|
52fba56bc3
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!476
|
4 years ago |
haroon amjad
|
f15090c634
|
Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
# lib/pages/login/register.dart
|
4 years ago |
haroon amjad
|
ecfbc3efab
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!477
|
4 years ago |
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
e7f5fc8434
|
Blood donation fixes
|
4 years ago |
haroon amjad
|
be2854c906
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
feedback status bar
See merge request Cloud_Solution/diplomatic-quarter!475
|
4 years ago |
Sultan Khan
|
64e62235c4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
a471824507
|
register issues
|
4 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
4 years ago |
haroon amjad
|
e82b8d4439
|
Lakum & other fixes
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 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
|
4 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
|
4 years ago |
Mohammad Aljammal
|
0d29ba70f5
|
Merge branch 'Oct_fixes' into 'development_new_design_2.0'
fix proceed button
See merge request Cloud_Solution/diplomatic-quarter!471
|
4 years ago |
haroon amjad
|
5692bc66a9
|
Removing anatomy pub from project
|
4 years ago |
Elham Rababh
|
d486b76116
|
fix merge issue
|
4 years ago |
haroon amjad
|
668d725b25
|
Laser booking
|
4 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
|
4 years ago |
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
4 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
|
4 years ago |
haroon amjad
|
89505510e3
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!469
|
4 years ago |
Mirza.Shafique
|
f547dc105c
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
69db41364f
|
icon fixs
|
4 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
|
4 years ago |
haroon amjad
|
62974b7b72
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
4 years ago |
Elham Rababh
|
616748dc6f
|
fix proceed button
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
9d71793e88
|
no message
|
4 years ago |
haroon amjad
|
c8e62e986c
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
LiveCare Schedule fixes
See merge request Cloud_Solution/diplomatic-quarter!466
|
4 years ago |
haroon amjad
|
57ea450662
|
LiveCare Schedule fixes
|
4 years ago |
Sikander Saleem
|
455f65a5e5
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
d2223da3c2
|
improvements.
|
4 years ago |
Mirza.Shafique
|
f56ae8ff5b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
4 years ago |
Sikander Saleem
|
8c27773f7f
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
40c63ae53b
|
dialog ui changes in wallet & improvements.
|
4 years ago |
haroon amjad
|
853ca033d2
|
LiveCare Schedule API fix
|
4 years ago |
Mirza.Shafique
|
a805273049
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
4 years ago |
haroon amjad
|
ccc08c00ae
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!465
|
4 years ago |
haroon amjad
|
3a7d5e3d66
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
2a212149ed
|
Health converters UI done
|
4 years ago |
haroon amjad
|
73822300f9
|
Health Calculators APIs updated
|
4 years ago |
haroon amjad
|
d4ffc76733
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Health Calculators APIs updated
See merge request Cloud_Solution/diplomatic-quarter!464
|
4 years ago |
haroon amjad
|
b7bf99c862
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!463
|
4 years ago |
haroon amjad
|
7123ed34ab
|
Translation updates
|
4 years ago |
haroon amjad
|
fd07d543fa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
cb69684bb8
|
SessionID update
|
4 years ago |