haroon amjad
|
be2a9380df
|
Analytics change
|
4 years ago |
haroon amjad
|
9464d543fc
|
updates
|
4 years ago |
haroon amjad
|
bc97cfa95b
|
Update Insurance changes
|
4 years ago |
haroon amjad
|
6ba695f2c9
|
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!596
|
4 years ago |
Sikander Saleem
|
27d0d80017
|
Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
# lib/pages/DrawerPages/family/my-family.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Sikander Saleem
|
bcf746aa0b
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
|
4 years ago |
haroon amjad
|
72e2707d4b
|
updates
|
4 years ago |
Sikander Saleem
|
1b82146303
|
my family switch profile on dashboard.
|
4 years ago |
Sikander Saleem
|
230444803d
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
|
4 years ago |
Sikander Saleem
|
fd73c248e2
|
my family switch profile improvement.
|
4 years ago |
Zohaib Iqbal Kambrani
|
d7931ac7da
|
Analytics: update set user
|
4 years ago |
haroon amjad
|
d344169399
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookSuccess.dart
|
4 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
9890d2caec
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
mobile number updates
video call setup with flutter 2.8, firebase modifications
|
4 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
haroon amjad
|
ce8a7c07de
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
4 years ago |
haroon amjad
|
ff72b4b31e
|
mobile number updates
|
4 years ago |
Sikander Saleem
|
7490d238e4
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
# Conflicts:
# lib/uitl/push-notification-handler.dart
|
4 years ago |
Sikander Saleem
|
67b87449a9
|
video call setup with flutter 2.8, firebase modifications
|
4 years ago |
Zohaib Iqbal Kambrani
|
bf7c1d1610
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
updates
livecare changes
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
aac15c5a4a
|
partial analytics fixes and updates
|
4 years ago |
haroon amjad
|
8c96de866b
|
updates
|
4 years ago |
haroon amjad
|
7d7864a1eb
|
livecare changes
|
4 years ago |
haroon amjad
|
0ea2550246
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
4 years ago |
haroon amjad
|
32edb2e71e
|
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
c61de7cfdc
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
23404b4495
|
Video call at InAppWebView
|
4 years ago |
Zohaib Iqbal Kambrani
|
936b7c28f9
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Covid updates & other fixes
# Conflicts: Resolved
# lib/config/config.dart
# lib/pages/webRTC/signaling.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
a398220033
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
a26b17f52d
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Translation fixes
OBGyne updates
updates
OB Gyne appo updates
no message
updates & fixes
no message
no message
Ancillary Orders completed
updates & fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
a8e1ba6b86
|
no message
|
4 years ago |
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
4 years ago |
haroon amjad
|
f879991b50
|
OBGyne updates
|
4 years ago |
haroon amjad
|
cbf49e31a1
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
4 years ago |
haroon amjad
|
2a343db335
|
updates
|
4 years ago |
haroon amjad
|
736edad018
|
OB Gyne appo updates
|
4 years ago |
haroon amjad
|
907181a56c
|
Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
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
|
4bc67b37e0
|
no message
|
4 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
4 years ago |
haroon amjad
|
f8b3847d0a
|
Ancillary Orders completed
|
4 years ago |
haroon amjad
|
ea8d700d22
|
updates & fixes
|
4 years ago |
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
|
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
|
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
|
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 |
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 |
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
|
6d88607631
|
Updates & fixes
|
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 |
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
|
c05772c63a
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
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 |
haroon amjad
|
3107d1e86d
|
Updates & fixes
|
4 years ago |
haroon amjad
|
eea701907d
|
Login fixes
|
4 years ago |
haroon amjad
|
0ae4a13c02
|
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!570
|
4 years ago |
Zohaib Iqbal Kambrani
|
1a6a26be75
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
merge improvements
Health plugin updated
fix search issue
JIRA bug fixes
updates & fixes
Fixes & updates
six issues
nfc plugin improvement.
disable lakum on check out page
fix issue
fix lakum issues
Smartwatch fixes
screen plugin improvement.
Updates & fixes
video call camera view issue fix, barcode plugin change, smart watches improvements.
add quantity filed fixed
pharmacy uo fix
Fixes
fix issue
Speech to text fix in iOS
...
# Conflicts: Resolved
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# android/build.gradle
# android/gradle/wrapper/gradle-wrapper.properties
# lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/incoming_call.dart
|
4 years ago |
Sikander Saleem
|
c8b5602d8e
|
flutter 2.8 improvements.
|
4 years ago |
Sikander Saleem
|
3ad90f1a01
|
Merge branch 'development_new_design_2.0' into development_v2.5
|
4 years ago |
haroon amjad
|
7733c74f00
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
63ffabcc86
|
no message
|
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
|
c379c6a37b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
Fatimah Alshammari
|
216cc4a7e3
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
d767febcd0
|
fix search issue
|
4 years ago |
haroon amjad
|
7bc8f69dfb
|
JIRA bug fixes
|
4 years ago |
haroon amjad
|
2670d0be57
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Fatimah Alshammari
|
b09b1e4732
|
six issues
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
Fatimah Alshammari
|
f9d1bbe2ee
|
disable lakum on check out page
|
4 years ago |
Fatimah Alshammari
|
cf7dd13a83
|
fix issue
|
4 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
|
4 years ago |
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
d5b58c07ca
|
Smartwatch fixes
|
4 years ago |
Sikander Saleem
|
2fd0fd3f85
|
screen plugin improvement.
|
4 years ago |
haroon amjad
|
a60e878fef
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
haroon amjad
|
0b4e674097
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
03e554b1af
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!562
|
4 years ago |
hussam al-habibeh
|
cf556c66b0
|
add quantity filed fixed
|
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 |
hussam al-habibeh
|
516fddf962
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
e291d46af7
|
pharmacy uo fix
|
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
|
3b9c1eb9ed
|
Appointment booking fix
|
4 years ago |
Sikander Saleem
|
caec2c4ca4
|
video call improvements.
|
4 years ago |
haroon amjad
|
302e9dbadd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
76984a4ef6
|
Fixes
|
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
|
c84d1cadad
|
fix address issue
|
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 |
Fatimah Alshammari
|
9d9377d59f
|
fix issues
|
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 |
haroon amjad
|
d7de2d6802
|
Merge branch 'products_tails' into 'development_new_design_2.0'
Products tails
See merge request Cloud_Solution/diplomatic-quarter!557
|
4 years ago |
haroon amjad
|
18c5b53b30
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy design home page
See merge request Cloud_Solution/diplomatic-quarter!556
|
4 years ago |
Elham Rababh
|
b2814d0183
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into products_tails
|
4 years ago |
hussam al-habibeh
|
9c8bd64142
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
6b1c0e04d0
|
pharmacy design home page
|
4 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
4 years ago |
haroon amjad
|
c1b194d15d
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
pharmacy home design
See merge request Cloud_Solution/diplomatic-quarter!555
|
4 years ago |
Elham Rababh
|
3e667d6b87
|
fix arabic language
|
4 years ago |
Elham Rababh
|
f623828d78
|
fix arabic language
|
4 years ago |
hussam al-habibeh
|
01433963bd
|
pharmacy home design
|
4 years ago |
Elham Rababh
|
8f044a635a
|
fix footer design
|
4 years ago |
haroon amjad
|
1a90698a99
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
fix ontap on prodcut card
See merge request Cloud_Solution/diplomatic-quarter!554
|
4 years ago |
hussam al-habibeh
|
1984400239
|
fix ontap on prodcut card
|
4 years ago |
haroon amjad
|
6c20bf50b5
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!553
|
4 years ago |
hussam al-habibeh
|
3c97122308
|
pharmacy home dsign
|
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
|
f06122d084
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!551
|
4 years ago |
haroon amjad
|
75423e5501
|
Updates
|
4 years ago |
Fatimah Alshammari
|
4d8271c45d
|
fix product details issue
|
4 years ago |
Fatimah Alshammari
|
169ebac076
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
Elham Rababh
|
d6eeb02c91
|
fix on design
|
4 years ago |
Fatimah Alshammari
|
fb974af726
|
fix issues
|
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
|
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 |
hussam al-habibeh
|
a5e7541394
|
new design pharmacy home
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
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
|
fe7baeab3c
|
LiveCare permissions
|
4 years ago |
haroon amjad
|
39190681c6
|
Updates
|
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 |
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
|
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 |
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
|
4b446bb6d0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
b2bb201a34
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
haroon amjad
|
333b41632c
|
fixes
|
4 years ago |
Sikander Saleem
|
53e0165286
|
improvements.
|
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
|
5bb20ea9a2
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
5f0985adaa
|
Updates
|
4 years ago |
Fatimah Alshammari
|
ffc2f2b4bb
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
1539945a29
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
c87a391a23
|
fixed wishlist issue
|
4 years ago |
haroon amjad
|
e67e17c2ba
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7d29ee4468
|
cart order page fixes
|
4 years ago |
haroon amjad
|
6d970800f9
|
Book Appo fix
|
4 years ago |
Fatimah Alshammari
|
a2a6da1527
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
5dc1561992
|
fixed notify issue
|
4 years ago |
haroon amjad
|
d0c96d245b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
3bd94ee05e
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
fix issues
Base app client updates
prescription reminders added
Medical Reminder 1.0
lakum fixes
Medical Reminder
|
4 years ago |
Zohaib Iqbal Kambrani
|
b596b1b61d
|
WebRTC and Packages Offer | Merge
|
4 years ago |
Fatimah Alshammari
|
468d64a1e0
|
fix design issue
|
4 years ago |
haroon amjad
|
7c6fa89d63
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7ffc467552
|
Lakum fixes
|
4 years ago |
Fatimah Alshammari
|
998c1af0f7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
ae3bb1bb2d
|
fix issues
|
4 years ago |
haroon amjad
|
ab7162f164
|
Base app client updates
|
4 years ago |
haroon amjad
|
68294690a1
|
prescription reminders added
|
4 years ago |
haroon amjad
|
ff0e878bf2
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
devmirza121
|
7f8a0320a7
|
Medical Reminder 1.0
|
4 years ago |
haroon amjad
|
61a406085b
|
lakum fixes
|
4 years ago |
devmirza121
|
f3b7a5c318
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
69b1dd6533
|
Medical Reminder
|
4 years ago |
haroon amjad
|
47b7b0db58
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
4 years ago |
Sikander Saleem
|
044c442ce0
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/parent_categorise_page.dart
|
4 years ago |
Sikander Saleem
|
5a8c887117
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Fatimah Alshammari
|
bdf3429502
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
4 years ago |
haroon amjad
|
8c9ff27515
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
777d88be30
|
updates
|
4 years ago |
haroon amjad
|
87a997d156
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!521
|
4 years ago |
Fatimah Alshammari
|
54ff9931cb
|
fixed arrow issue order page
|
4 years ago |
Sikander Saleem
|
084c82d7a8
|
improvements
|
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
|
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
|
4 years ago |
hussam al-habibeh
|
7607631052
|
sub categories pagnation
|
4 years ago |
hussam al-habibeh
|
c0e86721f6
|
Merge branch 'nov_fixes' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/widgets/ProductOrderItem.dart
|
4 years ago |
hussam al-habibeh
|
db1820fda4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
Fatimah Alshammari
|
3bfca80ab9
|
fixed issue
|
4 years ago |
Elham Rababh
|
258e107e1b
|
fix cart order page
|
4 years ago |
hussam al-habibeh
|
ff86dcbdc0
|
sub categories pagnation
|
4 years ago |
Elham Rababh
|
7b6622ee4c
|
fix cart order page
|
4 years ago |
haroon amjad
|
4823919fcb
|
Pharmacy fixes
|
4 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
|
4 years ago |
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
4 years ago |
haroon amjad
|
f533dd5356
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page
See merge request Cloud_Solution/diplomatic-quarter!515
|
4 years ago |
Elham Rababh
|
6ff829ab91
|
fix cart order page
|
4 years ago |
haroon amjad
|
d78d1f1068
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
sub categorise fix
See merge request Cloud_Solution/diplomatic-quarter!511
|
4 years ago |
haroon amjad
|
6db5577a12
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fixed issues
See merge request Cloud_Solution/diplomatic-quarter!513
|
4 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
|
4 years ago |
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
4 years ago |
hussam al-habibeh
|
e917da9183
|
sub Categorise fixed
|
4 years ago |
hussam al-habibeh
|
80c6be239e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/sub_categorise_page.dart
|
4 years ago |
hussam al-habibeh
|
300668cc81
|
sub Categorise fixed
|
4 years ago |
Fatimah Alshammari
|
333247faa2
|
fixed issues
|
4 years ago |
Elham Rababh
|
fb1d07fcba
|
fix cart back button
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
hussam al-habibeh
|
d7b32df024
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
9ccb155761
|
sub categorise fix
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
4 years ago |
haroon amjad
|
67b6fd4ab6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Elham Ali
|
f0bb496df5
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!506
|
4 years ago |
haroon amjad
|
7a8ed5b014
|
Total amount calculation fixes
|
4 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
4 years ago |
haroon amjad
|
c29aee46dd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
|
4 years ago |
haroon amjad
|
a3fdb35c30
|
fixes
|
4 years ago |
Elham Rababh
|
f88864efd4
|
fix calling missing APi
|
4 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
|
4 years ago |
hussam al-habibeh
|
307e488a0e
|
pharmacy product pagination
|
4 years ago |
hussam al-habibeh
|
a35e149088
|
product pagination
|
4 years ago |
Elham Ali
|
a9bd9f1fdf
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar in cart page
See merge request Cloud_Solution/diplomatic-quarter!504
|
4 years ago |
haroon amjad
|
289e74fd0a
|
fixes
|
4 years ago |
Elham Rababh
|
05e4e7be45
|
fix bottom bar in cart page
|
4 years ago |
haroon amjad
|
08f0f7b660
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue
See merge request Cloud_Solution/diplomatic-quarter!501
|
4 years ago |
Elham Ali
|
47c2c80b36
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes
See merge request Cloud_Solution/diplomatic-quarter!502
|
4 years ago |
Elham Rababh
|
65aac99806
|
fix Availabilty part
|
4 years ago |
Fatimah Alshammari
|
d1e0b6ccd9
|
fix issue
|
4 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
|
4 years ago |
devmirza121
|
6575456d3b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
4 years ago |
Elham Rababh
|
8a168386da
|
fix black screen which is appear in cart page
|
4 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
96ec3f2926
|
fix issues
|
4 years ago |
Elham Rababh
|
dc7a5d3dca
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
4 years ago |
Elham Rababh
|
2c3c270c43
|
finish steps inside payment
|
4 years ago |
Elham Rababh
|
b7dc6ee4b1
|
change model
|
4 years ago |
Fatimah Alshammari
|
444bc7383d
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
62d904aa68
|
fixed issues
|
4 years ago |
Elham Rababh
|
41097f119c
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
4 years ago |
haroon amjad
|
11d37d26e5
|
Product Detail page fix
|
4 years ago |
Elham Rababh
|
45d167fc5e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
haroon amjad
|
338c646a43
|
updates
|
4 years ago |
haroon amjad
|
534b82461a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
14b85cc407
|
Family files API changes
|
4 years ago |
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
4 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
|
4 years ago |
devmirza121
|
1d1708bdcc
|
Health Calculator 4.0
|
4 years ago |
Elham Rababh
|
4e54349e3b
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
Elham Rababh
|
df9e58402d
|
first step from update design
|
4 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
|
4 years ago |
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
4 years ago |
Elham Rababh
|
f8883f5439
|
first step from fixing check out process
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
4 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
4 years ago |
haroon amjad
|
90b821a37d
|
Offers & packages UI completed
|
4 years ago |
haroon amjad
|
d2834bb3dd
|
Health calculator fixes
|
4 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
|
4 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
|
4 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |
devmirza121
|
566de7936a
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
6225f2468d
|
Health Calculator 3.0
|
4 years ago |
Fatimah Alshammari
|
ce0dff11b2
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
eb4801c7ee
|
fixed rating issues
|
4 years ago |
Haroon Amjad
|
d5c68c5032
|
Packages & offers design
|
4 years ago |
haroon amjad
|
b752b42a34
|
Updates & fixes
|
4 years ago |
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
4 years ago |
devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
4 years ago |
Fatimah Alshammari
|
77c8c85e88
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
haroon amjad
|
9ce77b56b9
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
4 years ago |
haroon amjad
|
30e67bbe3e
|
updates
|
4 years ago |
haroon amjad
|
c253ec3110
|
LiveCare UI revamped
|
4 years ago |
haroon amjad
|
f995a9fa8e
|
Ambulance request UI revamped
|
4 years ago |
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
6f63250252
|
fix issues
|
4 years ago |
haroon amjad
|
e1e31de818
|
Lakum fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
4 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
bebcd85557
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
5943522163
|
UI fixes
|
4 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
|
4 years ago |
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
4 years ago |
haroon amjad
|
925e3cb686
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/login/login.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/screens/product-details/product-detail.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacy/profile/profile.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
haroon amjad
|
585e26b091
|
Registration fix
|
4 years ago |
Mohammad Aljammal
|
fd46259701
|
Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages
See merge request Cloud_Solution/diplomatic-quarter!479
|
4 years ago |
hussam al-habibeh
|
cb85085969
|
show bottom nav in pharmacy all pages
|
4 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
|
4 years ago |
Mohammad Aljammal
|
c0cf2f71a2
|
Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
|
4 years ago |
hussam al-habibeh
|
46d7e7ee14
|
show bottom nav in pharmacy all pages
|
4 years ago |
Sikander Saleem
|
cd81f05a8d
|
laser clinic design (cont.)
|
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
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
e7f5fc8434
|
Blood donation fixes
|
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
|
f424315a19
|
last commit 😄
|
4 years ago |
Mohammad Aljammal
|
d4283c0116
|
fix merge issue
|
4 years ago |
Mohammad Aljammal
|
4cb63e353b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
Conflicts:
lib/pages/pharmacies/screens/product-details/product-detail.dart
|
4 years ago |
Fatimah Alshammari
|
9cececf3f1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
4 years ago |
haroon amjad
|
5692bc66a9
|
Removing anatomy pub from project
|
4 years ago |
Elham Rababh
|
d486b76116
|
fix merge issue
|
4 years ago |
hussam al-habibeh
|
bc91b9ad88
|
bottom nav pharmacy
|
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 |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
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 |
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
|
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
|
2a212149ed
|
Health converters UI done
|
4 years ago |
haroon amjad
|
73822300f9
|
Health Calculators APIs updated
|
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 |
Mirza.Shafique
|
cacdd5907c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
fd26a59b2d
|
live care design 1.0
|
4 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
4 years ago |
Sikander Saleem
|
c1ce3a0489
|
blood sugar dialog improvement.
|
4 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
4 years ago |
Fatimah Alshammari
|
c242910aa2
|
fixed issues
|
4 years ago |
haroon amjad
|
5474ecf2cc
|
Translation update
|
4 years ago |
haroon amjad
|
b53d912996
|
Fixes & updates
|
4 years ago |
haroon amjad
|
df7d8a8603
|
Blood donation fixes
|
4 years ago |
haroon amjad
|
924f685342
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/Blood/blood_donation.dart
|
4 years ago |
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
4 years ago |
Sikander Saleem
|
ebb4c026c6
|
improvements
|
4 years ago |
Sikander Saleem
|
d8476df6dd
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
|
4 years ago |
Sikander Saleem
|
4858f8883a
|
blood donation dialog change & improvements.
|
4 years ago |
Fatimah Alshammari
|
428791c725
|
fixed design
|
4 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
|
4 years ago |
Fatimah Alshammari
|
1089ce3aa3
|
Updates
|
4 years ago |
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
4 years ago |
haroon amjad
|
eed4fd2509
|
Pharmacy prescriptions page design
|
4 years ago |
haroon amjad
|
20076f2f2b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
2cff7c3246
|
LiveCare design fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
ebfa9cd630
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
Layout files
pharmacy updates
fixed issues
Updates
UI fixes
Updates
Smartwatch updates
Smartwatch updates
fixed issues
fixed loader issue
|
4 years ago |
Zohaib Iqbal Kambrani
|
f3462dfc19
|
Applied cost from api at cart
|
4 years ago |
haroon amjad
|
6f92a093ab
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
9dbe922259
|
pharmacy updates
|
4 years ago |
haroon amjad
|
e58b925382
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
4 years ago |
haroon amjad
|
41822d2cf1
|
Merge branch 'development' into haroon-new-design
|
4 years ago |
haroon amjad
|
e913316c54
|
Updates
|
4 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
|
4 years ago |
haroon amjad
|
68829d0986
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
0be197a782
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e3bfe83ea2
|
app bar back icon issue
|
4 years ago |
haroon amjad
|
940441106a
|
UI fixes
|
4 years ago |
haroon amjad
|
be91844868
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
30c6f1dedb
|
Updates
|
4 years ago |
Sikander Saleem
|
de43c6bfa4
|
improvements
|
4 years ago |
Sikander Saleem
|
7641da8122
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/widgets/hospital_location.dart
|
4 years ago |
Sikander Saleem
|
7c4edf971a
|
emergency nearest ui changes
|
4 years ago |
Mirza.Shafique
|
fe1a287070
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
5514753288
|
Zoom Avatar implementation
|
4 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
haroon amjad
|
d409875741
|
Smartwatch updates
|
4 years ago |
haroon amjad
|
b52c719351
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
1f077f71f8
|
no message
|
4 years ago |
Mirza.Shafique
|
957ff9039b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
1a6802ce24
|
Child Vaccine 3
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
4 years ago |
haroon amjad
|
5287260b85
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
745b167c47
|
register
|
4 years ago |
Sultan Khan
|
58ab90f6d3
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
c14f40dae2
|
register page
|
4 years ago |
haroon amjad
|
983fb55747
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
2032053cb7
|
Working on Health data
|
4 years ago |
Mirza.Shafique
|
4f7666cfd8
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
ce115e1037
|
Child Vaccine 2
|
4 years ago |
Sultan Khan
|
eaea14ce3d
|
registration
|
4 years ago |
haroon amjad
|
2062b96652
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
4 years ago |
Sultan Khan
|
a59c60f79a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
496c6ce32e
|
registration done
|
4 years ago |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
4 years ago |
haroon amjad
|
3d22cdb17c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
680dcfc255
|
In App Review
|
4 years ago |
Mirza.Shafique
|
41db218e9a
|
oder log merge fix
|
4 years ago |
Mirza.Shafique
|
d3698a0e74
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
|
4 years ago |
Mirza.Shafique
|
3d480bac5c
|
design fixes 3
|
4 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
12a58856e5
|
Chart fix & In-App update implemented
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
Sikander Saleem
|
4dca22bec1
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
afad83182d
|
h20 dialog ui changes
|
4 years ago |
haroon amjad
|
0c895348e7
|
my family fix
|
4 years ago |
haroon amjad
|
a710406317
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
# lib/pages/DrawerPages/family/my-family.dart
|
4 years ago |
haroon amjad
|
75d3751719
|
Offers API
|
4 years ago |
haroon amjad
|
494b1f221d
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
792bb4df0b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/medical/my_trackers/Weight/WeightMonthlyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
# lib/pages/medical/my_trackers/Weight/WeightYeaPage.dart
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
haroon amjad
|
8001c0140c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/medical/my_trackers/Weight/WeightWeeklyPage.dart
|
4 years ago |
haroon amjad
|
1858be18b7
|
Feedback Status fixes
|
4 years ago |
Sikander Saleem
|
554b9558b1
|
add reminder & send mail button color change.
|
4 years ago |
Sikander Saleem
|
14ccae993e
|
my tracker tabs switching issue fixed.
|
4 years ago |
Haroon Amjad
|
59dac89118
|
updates
|
4 years ago |
haroon amjad
|
ade3cb0899
|
File no & UI changes
|
4 years ago |
haroon amjad
|
1dcfe44e96
|
Translations
|
4 years ago |
haroon amjad
|
2ed8008790
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
haroon amjad
|
832d48971f
|
updates
|
4 years ago |
Mirza.Shafique
|
4cf9a9b2c2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
3dbef4095f
|
Payment page design
|
4 years ago |
Sikander Saleem
|
ba4792cd38
|
merge improvements.
|
4 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
|
4 years ago |
haroon amjad
|
43a672cc68
|
Updates & fixes
|
4 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
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Mirza.Shafique
|
ab6f7b8915
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
eeaf7d9d2f
|
HMG Services Detail View
|
4 years ago |
Sikander Saleem
|
f13871de9a
|
find us and prescription availability hospital location ui changes,
|
4 years ago |
Fatimah Alshammari
|
f649701276
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
|
4 years ago |
Fatimah Alshammari
|
3be7f7f899
|
fixed loader issue
|
4 years ago |
haroon amjad
|
ed4fca2d4c
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!444
|
4 years ago |
haroon amjad
|
babb48b1db
|
base app client changes
|
4 years ago |
haroon amjad
|
cf7291e379
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
03882c166c
|
Translation & UI updates
|
4 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
|
4 years ago |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
4 years ago |
Sultan Khan
|
18f35a22bb
|
FAMILY FILE
|
4 years ago |
Sultan Khan
|
5a9ab457e5
|
family files
|
4 years ago |
haroon amjad
|
6d3ead24e1
|
localisation update
|
4 years ago |
Sultan Khan
|
a31f55aaa7
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
4780039cc7
|
family file change
|
4 years ago |
Mirza.Shafique
|
05a6860081
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e1b79ef5c1
|
E-Refreal design
|
4 years ago |
Sikander Saleem
|
ecb6315f9c
|
blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
|
4 years ago |
haroon amjad
|
2db050a228
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
0b4305de03
|
all dialog changes and improvements (cont).
|
4 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
4 years ago |
Sultan Khan
|
448a3aaa48
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
881644a22e
|
family files changes
|
4 years ago |
Fatimah Alshammari
|
e2763a5bd5
|
fixed cart shopping issues
|
4 years ago |
haroon amjad
|
6cd2f65ce8
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
9d30bf63d0
|
Notification page fix
|
4 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
|
4 years ago |
haroon amjad
|
43c67a5a84
|
Notifications UI fix
|
4 years ago |
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
4 years ago |
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
4 years ago |
haroon amjad
|
8cf6642c79
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
803f5a786b
|
Blood pressure chart fix
|
4 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
|
4 years ago |
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
4 years ago |
Sultan Khan
|
a39658206d
|
my family
|
4 years ago |
haroon amjad
|
40cbca565a
|
fixes
|
4 years ago |
haroon amjad
|
e1f5eb8b83
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
8ea6a5de04
|
localization fix
|
4 years ago |
Sultan Khan
|
160049973e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
e3a7c08e7c
|
blood type changes
|
4 years ago |
Sikander Saleem
|
54c3beadf2
|
improvements.
|
4 years ago |
Sikander Saleem
|
8f371f87d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
4 years ago |
Mirza.Shafique
|
dde16a13fe
|
General page in profile
|
4 years ago |
Sikander Saleem
|
21863cfe06
|
improvements.
|
4 years ago |
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
4 years ago |
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
4 years ago |
haroon amjad
|
4a2e01b8b1
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Sultan Khan
|
5c8b809e39
|
family file fixes
|
4 years ago |
Fatimah Alshammari
|
d8db5ad590
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/pharmacies/screens/cart-order-page.dart
|
4 years ago |
Fatimah Alshammari
|
30a1353be6
|
fixed brands design and recommended products issues
|
4 years ago |
hussam al-habibeh
|
a8fb7152b1
|
add to cart fix
|
4 years ago |
hussam al-habibeh
|
75ef3fde80
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
Conflicts:
lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
|
4 years ago |
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
4 years ago |
hussam al-habibeh
|
66acda38a3
|
add to cart fix
|
4 years ago |
Elham Rababh
|
75fdadafbd
|
refactor widget in the cart preview
|
4 years ago |
Elham Rababh
|
2526d6bc6f
|
fix issue in cart page
|
4 years ago |
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
4 years ago |
haroon amjad
|
6902e6529c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan khan
|
5dbb257194
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!433
|
4 years ago |
Sikander Saleem
|
f6b96dcb7b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByDoctor.dart
|
4 years ago |
Sultan Khan
|
3b4e03c618
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
b5cd6afa4b
|
family file fixs
|
4 years ago |
Sikander Saleem
|
c9662c7451
|
schedule appointment navigation fix.
|
4 years ago |
haroon amjad
|
0a9d0e5eaa
|
fixes
|
4 years ago |
Mirza.Shafique
|
6261f01ab6
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
9c7e8e3637
|
Back Button on Landing Page 1
|
4 years ago |
haroon amjad
|
3f3ddd7af0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |
Sikander Saleem
|
f509679173
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
cbf2e84959
|
fixes
|
4 years ago |
Sikander Saleem
|
1346eab593
|
h2o today page, prescription & schedule appointment improvements.
|
4 years ago |
haroon amjad
|
022b1bd000
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan Khan
|
02f5b43b64
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
ca70926050
|
family file fixes
|
4 years ago |
haroon amjad
|
cb220031dd
|
Updates & fixes
|
4 years ago |
mosazaid
|
b779c250a4
|
pharmacy cart and wishlist fixes
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
Mirza.Shafique
|
3a07d39bff
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
mosazaid
|
9a1dc3c678
|
pharmacy cart and wishlist fixes
|
4 years ago |
haroon amjad
|
6c4afaf114
|
Advance payment API updates
|
4 years ago |
Fatimah Alshammari
|
10f75191c6
|
added shopping cart to categories
|
4 years ago |
Mirza.Shafique
|
4d372bffb2
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
e788f09ed9
|
Show Chart Widget
|
4 years ago |
Haroon Amjad
|
1fa6a4409b
|
Family files fixes
|
4 years ago |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
haroon amjad
|
a819660536
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
Sultan khan
|
7e095248c5
|
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes
See merge request Cloud_Solution/diplomatic-quarter!428
|
4 years ago |
Sikander Saleem
|
8aa1fbfb4a
|
localized_values fixed.
|
4 years ago |
Sultan Khan
|
9010558dc9
|
family files changes
|
4 years ago |
Sikander Saleem
|
08960867f7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
2aa6ad5d6b
|
h20 today ui (cont.)1
|
4 years ago |
Sikander Saleem
|
55df00dcd4
|
h20 today ui (cont.)
|
4 years ago |
haroon amjad
|
7264d03818
|
Family Files previleges fix
|
4 years ago |
Sikander Saleem
|
763c16ddd0
|
h2o setting ui redesigned.
|
4 years ago |
haroon amjad
|
259581c4f8
|
updates & fixes
|
4 years ago |
Mohammad Aljammal
|
29d0afdea4
|
Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions
See merge request Cloud_Solution/diplomatic-quarter!424
|
4 years ago |
Elham Rababh
|
be21cb352b
|
return recommended products
|
4 years ago |
haroon amjad
|
96c290c3f3
|
Localization file updates
|
4 years ago |
haroon amjad
|
829fcd1461
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
|
4 years ago |
haroon amjad
|
2c4ff16f0c
|
updates & fixes
|
4 years ago |
Sultan Khan
|
821a9b5ade
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
cb230db0c5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
a9773e81e7
|
Bug Fixes prescription
|
4 years ago |
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
4 years ago |
Fatimah Alshammari
|
ac63f09633
|
edit arabic version
|
4 years ago |
Fatimah Alshammari
|
8baad999c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/config/config.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/wishlist.dart
|
4 years ago |
Elham Rababh
|
8fac62bcb1
|
fix bottom sheet functions
|
4 years ago |
Fatimah Alshammari
|
74929f76e5
|
edit home page
|
4 years ago |
Mohammad Aljammal
|
bcd99555e3
|
Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
|
4 years ago |
mosazaid
|
c1f3d3cc1c
|
fixes
|
4 years ago |
Elham Rababh
|
944bbce1bf
|
add count to cart
|
4 years ago |
Elham Rababh
|
bfbd04e35d
|
add count to cart
|
4 years ago |
mosazaid
|
acdd19eeed
|
calling cart from pharmacy home and add provider to it
|
4 years ago |
Mohammad Aljammal
|
0150bc4684
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/ProductCheckTypeWidget.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
eb19daa98f
|
fix car count
|
4 years ago |
Elham Rababh
|
3dc28d318a
|
fix bugs on wish list
|
4 years ago |
Fatimah Alshammari
|
4309952b17
|
fixed subCategories
|
4 years ago |
Sikander Saleem
|
b4031e973e
|
chevron icon to arrow forward
|
4 years ago |
Elham Rababh
|
b0b278a7e3
|
fix bugs
|
4 years ago |
haroon amjad
|
503ab739ca
|
prescription availability design revamped
|
4 years ago |
Elham Rababh
|
145117aa63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
Elham Rababh
|
9254004125
|
fix coloring issue
|
4 years ago |
mosazaid
|
8b5e1e57c7
|
fix bugs pharmacy wishlist
|
4 years ago |
mosazaid
|
4d37bc2958
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
Conflicts:
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/pharmacies/screens/product-details/recommended_products.dart
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
lib/widgets/others/app_scafold_detail_page.dart
|
4 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
4 years ago |
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
4 years ago |
haroon amjad
|
46a572674f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
69af6799c4
|
updates
|
4 years ago |
Mirza.Shafique
|
3a40eb92be
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
06c5ee269b
|
Bug Fixes
|
4 years ago |
Sultan Khan
|
1b387c2dbf
|
changes pushed
|
4 years ago |
Elham Rababh
|
58d43f7e46
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
2981eb3236
|
fix public card issues
|
4 years ago |
haroon amjad
|
2690bddcac
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
Sultan Khan
|
d514f64870
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
76e16594ba
|
FAMILY FILES
|
4 years ago |
Sikander Saleem
|
6099738a5c
|
improvements
|
4 years ago |
mosazaid
|
0d2d4c64c2
|
fix bugs pharmacy home and increase performance
|
4 years ago |
Elham Rababh
|
7dfc700d26
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Sikander Saleem
|
df31c82fd5
|
doctor header review on tap improvement.
|
4 years ago |
Elham Rababh
|
055b888ba2
|
fix address
|
4 years ago |
Elham Rababh
|
3b79d0ac41
|
return the disable colors
|
4 years ago |
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
4 years ago |
Sikander Saleem
|
5410b826c3
|
prescriptions new ui updated.
|
4 years ago |
Mohammad Aljammal
|
48642a3c7c
|
Merge branch 'product_detail_page' into 'development'
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!414
|
4 years ago |
Mohammad Aljammal
|
b175fb7ce0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Haroon Amjad
|
19edcc210e
|
Rate appointment UI implemented
|
4 years ago |
haroon amjad
|
89e1aa70c0
|
updates
|
4 years ago |
Elham Rababh
|
1e1e230908
|
fix call service in case not login
|
4 years ago |
Mohammad Aljammal
|
b539ff5851
|
Merge branch 'pharmacy_fix' into 'development'
cart fix
See merge request Cloud_Solution/diplomatic-quarter!413
|
4 years ago |
Elham Rababh
|
a5751f0d70
|
handel un login cases
|
4 years ago |
hussam al-habibeh
|
c56e4a1a5c
|
cart fix
|
4 years ago |
Mohammad Aljammal
|
6339e30369
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!412
|
4 years ago |
mosazaid
|
a9d0b7a14b
|
fix bugs pharmacy home
|
4 years ago |
Elham Rababh
|
19cb48e133
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
|
4 years ago |
Elham Rababh
|
338901d423
|
remove add to cart
|
4 years ago |
Elham Rababh
|
7c15bca746
|
fix item
|
4 years ago |
mosazaid
|
6acb8031d0
|
fix bugs pharmacy home
|
4 years ago |
Mohammad Aljammal
|
76eef8625d
|
Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!411
|
4 years ago |
mosazaid
|
594b2710b3
|
fix bugs pharmacy home
|
4 years ago |
haroon amjad
|
22c6a8ce42
|
no message
|
4 years ago |
haroon amjad
|
85d68b0388
|
ereferral fixes
|
4 years ago |
Mohammad Aljammal
|
1f9e7563a9
|
Merge branch 'product_detail_page' into 'development'
fix scaffold
See merge request Cloud_Solution/diplomatic-quarter!409
|
4 years ago |
Sultan Khan
|
fed33ae4dc
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
fee23de1fd
|
hhc changes
|
4 years ago |
Elham Rababh
|
ad0c8eaffb
|
fix scaffold
|
4 years ago |
Mohammad Aljammal
|
b64a5b29c5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
Mohammad Aljammal
|
9e31d497ed
|
fix wish list issue
|
4 years ago |
Mohammad Aljammal
|
361b72624b
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!407
|
4 years ago |
Elham Rababh
|
65cf4316ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Elham Rababh
|
bb96201c2e
|
remove the custom scaffold
|
4 years ago |
Sikander Saleem
|
28c0450544
|
lab result filterName improvement.
|
4 years ago |
hussam al-habibeh
|
f3000d0ee3
|
My account design fix
|
4 years ago |
Elham Rababh
|
e20e90c20c
|
fix quantity_box
|
4 years ago |
haroon amjad
|
f6d779431a
|
fixes
|
4 years ago |
haroon amjad
|
8133f8a23a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
46cc73bdd7
|
CMC changes
|
4 years ago |
Sultan Khan
|
6159be0f75
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
haroon amjad
|
8cc36ae848
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
dfafb6b664
|
fixes
|
4 years ago |
Mirza.Shafique
|
c23478b838
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
205b4d6b21
|
Photo view in CMC
|
4 years ago |
Mohammad Aljammal
|
424552d672
|
Merge branch 'pharmacy_fix' into 'development'
add pharmacy icons for bottom nav
See merge request Cloud_Solution/diplomatic-quarter!403
|
4 years ago |
Elham Rababh
|
d5f1a162c0
|
replace bottom sheet button
|
4 years ago |
hussam al-habibeh
|
85e6032875
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
mosazaid
|
185d66e342
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
d4fd95606e
|
add pharmacy icons for bottom nav
|
4 years ago |
Sikander Saleem
|
d1f3428def
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
df32ae0142
|
lab order clinic/hospital name, prescription reminder ui, prescription availibility
|
4 years ago |
haroon amjad
|
879ce4ee06
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7675a4496a
|
my vaccine & lab result fix
|
4 years ago |
Sultan Khan
|
a4ab22a4aa
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
5b988dff4f
|
BUG FIXES
|
4 years ago |
Mirza.Shafique
|
5e383e57d9
|
CMC error Fixes
|
4 years ago |
Elham Rababh
|
6fe41382c0
|
first step from design
|
4 years ago |
Sikander Saleem
|
3403e07aba
|
recall prescription order log when refill or cancel order.
|
4 years ago |
mosazaid
|
c558fe6bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
f47d59c43f
|
fix bugs pharmacy home
|
4 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
4 years ago |
Haroon Amjad
|
abcb71e86e
|
Invoice details UI revamped
|
4 years ago |
haroon amjad
|
c91b8ce777
|
My Vaccines design revamped
|
4 years ago |
Elham Rababh
|
2839af658a
|
fix issues
|
4 years ago |
haroon amjad
|
dfeb249a54
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
a4a2389a78
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
f63293ef3e
|
login input rtl
|
4 years ago |
mosazaid
|
fdb61c78c5
|
fix bugs pharmacy home
|
4 years ago |
Sultan Khan
|
fc9f2fc34e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
hussam al-habibeh
|
9a2d52309c
|
products categories page fix
|
4 years ago |
Sikander Saleem
|
5bdb56df60
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
5fda70decf
|
cmc & hhc order log ui improvements.
|
4 years ago |
hussam al-habibeh
|
cb2b9db0ab
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
|
4 years ago |
Mirza.Shafique
|
bc246b2f9f
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
Mirza.Shafique
|
f0566fb069
|
CMC Images
|
4 years ago |
Mohammad Aljammal
|
b53bd5fd62
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
Conflicts:
lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
Mohammad Aljammal
|
43e7bb9ff3
|
fix bottom navigation bar
|
4 years ago |
mosazaid
|
a398ede172
|
fix bugs pharmacy home
|
4 years ago |
hussam al-habibeh
|
2265487ccd
|
remove cart cout & icon from AppBar
|
4 years ago |
Elham Rababh
|
769dc4e0ac
|
first step of ProductDetailPage refactor
|
4 years ago |
Elham Rababh
|
a269b514a9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
Conflicts:
lib/config/config.dart
|
4 years ago |
Elham Rababh
|
c7a0d39aab
|
first step of ProductDetailPage refactor
|
4 years ago |
haroon amjad
|
184942e891
|
Covid Payment fixes
|
4 years ago |
haroon amjad
|
ab8030416c
|
Updates & fixes
|
4 years ago |
hussam al-habibeh
|
806e07e4e6
|
products categories page fix
|
4 years ago |
Mirza.Shafique
|
9b160958bb
|
Covid New Design 3
|
4 years ago |
mosazaid
|
f329eea798
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
|
4 years ago |
mosazaid
|
01a77d5352
|
fix bugs pharmacy
|
4 years ago |
Mohammad Aljammal
|
d64e2a469f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
|
4 years ago |
Mohammad Aljammal
|
8ecd4a24d8
|
fix product tile
|
4 years ago |
Mohammad Aljammal
|
8c7f397ac8
|
Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!397
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Elham Rababh
|
db277a62f5
|
fix brand design
|
4 years ago |
Elham Rababh
|
a6a7ed4e1b
|
remove cart from product details
|
4 years ago |
Elham Rababh
|
9b42d411ca
|
remove cart from product details
|
4 years ago |
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
6e244a55f5
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
7563a2870b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
b80e2ea16e
|
Covid New Design 2
|
4 years ago |
Sikander Saleem
|
74432b6bbb
|
cmc order log ui changes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
Mirza.Shafique
|
ef8006efd8
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
# lib/pages/Covid-DriveThru/covid-payment-alert.dart
# lib/pages/Covid-DriveThru/covid-payment-details.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
|
4 years ago |
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
4 years ago |
Elham Rababh
|
cc88f0f81e
|
first step of fixing
|
4 years ago |
Sikander Saleem
|
9f8bcc63f3
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
|
4 years ago |
Sikander Saleem
|
4ce941e01e
|
prescription order log detail view change on arabic
|
4 years ago |
Sikander Saleem
|
c96fa62363
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e36e0ce0b7
|
h20 bottom nav bar bug fix (happen in release mode)
|
4 years ago |
hussam al-habibeh
|
7427cd68ff
|
fix bottom nav bar ui
|
4 years ago |
haroon amjad
|
19e6954bc8
|
updates
|
4 years ago |
haroon amjad
|
c3feed771c
|
merge conflicts resolved
|
4 years ago |
haroon amjad
|
5c64ce4795
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/MyAppointments/SchedulePage.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
b0f4cfcff3
|
Family file fixes
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
haroon amjad
|
2fc5425884
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
f55fbd1cc2
|
UI fixes
|
4 years ago |
haroon amjad
|
4b1a2d4f3d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
|
4 years ago |
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
4 years ago |
Sultan Khan
|
54ac31a74c
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
a57facb876
|
family file fix
|
4 years ago |
Sultan Khan
|
c58023efc3
|
family file fixes
|
4 years ago |
Sikander Saleem
|
7b8093b7ba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
c1b23b7c2a
|
improvements
|
4 years ago |
Mirza.Shafique
|
e24eaa791b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
5b47aaac6f
|
icon and find us distance
|
4 years ago |
haroon amjad
|
728c22cc68
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/insurance/insurance_approval_screen.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
0348397df3
|
insurance approval detail company name added.
|
4 years ago |
Sikander Saleem
|
4a30c59f83
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
e37781c3a6
|
insurance approval screen and detail screen ui changes.
|
4 years ago |
haroon amjad
|
ba7d0329c3
|
Dental Invoices UI
|
4 years ago |
haroon amjad
|
af7b27258c
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sultan Khan
|
0e43ca173a
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
4 years ago |
haroon amjad
|
f9b57ce4aa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
4ac0845003
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
719cdbd2e4
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
8a4cf9f23b
|
Line Chart Fix in Vital Signs
|
4 years ago |
Sikander Saleem
|
baf4eab604
|
prescription order detail ui changes
|
4 years ago |
haroon amjad
|
bbcf22ddfa
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
4caacb968b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
d9405b2bd0
|
prescription order log ui changes
|
4 years ago |
Sikander Saleem
|
8e27d8210a
|
prescription detail ui changes.
|
4 years ago |
Mirza.Shafique
|
350882b1d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
ef2bcc1c65
|
Web RTC Design implementation
|
4 years ago |
haroon amjad
|
ad3463bbfc
|
active medication design revamped
|
4 years ago |