haroon amjad
|
63426a691d
|
Ancillary orders family members issue resolved
|
2 years ago |
|
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
2 years ago |
|
haroon amjad
|
3bc09f792a
|
Pharma LiveCare fixes
|
2 years ago |
|
haroon amjad
|
a20d6c7c28
|
Livecare updates
|
2 years ago |
|
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
2 years ago |
|
haroon amjad
|
da423fe12a
|
Pharma LiveCare updates
|
2 years ago |
|
haroon amjad
|
f686013692
|
Pharma LiveCare updates
|
2 years ago |
|
haroon amjad
|
4f50c3ff8e
|
Pharmacy LiveCare revamped
|
2 years ago |
|
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
6bdb7a3305
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
2 years ago |
|
haroon amjad
|
2e72d6a550
|
LiveCare contact added
|
2 years ago |
|
haroon amjad
|
aafdf3760d
|
added sick leave status text & color
|
2 years ago |
|
haroon amjad
|
c8ec536267
|
Sickleave CR done
|
2 years ago |
|
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
2 years ago |
|
haroon amjad
|
22274ebbb0
|
updates & fixes
|
2 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
2 years ago |
|
haroon amjad
|
22a0e456bc
|
Manual Insurance Updates, Service ID fixes, Tamara Fixes
|
2 years ago |
|
haroon amjad
|
52070c8f94
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
e80ac2481a
|
Ancillary order & manual insurance update
|
2 years ago |
|
haroon amjad
|
442a94ac08
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
3709ebcb32
|
Updates
|
2 years ago |
|
haroon amjad
|
7ae4e7d616
|
updates & fixes
|
2 years ago |
|
haroon amjad
|
d75615a2eb
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
2 years ago |
|
haroon amjad
|
106334c9cf
|
updates & fixes
|
2 years ago |
|
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
2 years ago |
|
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
2 years ago |
|
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
2 years ago |
|
haroon amjad
|
833818e6e3
|
Rad & Lab email issues fixes
|
2 years ago |
|
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
2 years ago |
|
haroon amjad
|
ca43849d9d
|
CMC Updates
|
2 years ago |
|
haroon amjad
|
11529c65c5
|
updates
|
2 years ago |
|
haroon amjad
|
4ba229c436
|
Updates
|
2 years ago |
|
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
7018696328
|
E-Cens sign off
|
2 years ago |
|
haroon amjad
|
3396b4253b
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
f9a733884d
|
Calendar fixes
|
2 years ago |
|
haroon amjad
|
27c6837f25
|
updates & fixes
|
2 years ago |
|
Zohaib Iqbal Kambrani
|
fb4fb8d29e
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Google analytics events update
Updates
Updates & fixes
DateTime Fixes
HHC Fixes
updates & fixes
Updates & fixes
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
2 years ago |
|
Zohaib Iqbal Kambrani
|
8a95daff7c
|
Google analytics events update
|
2 years ago |
|
Zohaib Iqbal Kambrani
|
e107d8a1a4
|
no message
|
2 years ago |
|
haroon amjad
|
1faf27959a
|
Updates
|
2 years ago |
|
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
842e099953
|
DateTime Fixes
|
2 years ago |
|
haroon amjad
|
f1129cc14c
|
updates & fixes
|
2 years ago |
|
Zohaib Iqbal Kambrani
|
612d9eb019
|
Project Filter Applied on Packages & Offers
|
2 years ago |
|
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
8d988ba994
|
updates & fixes
|
2 years ago |
|
haroon amjad
|
4ba37d342c
|
RRT Updates
|
3 years ago |
|
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
3 years ago |
|
haroon amjad
|
72e2707d4b
|
updates
|
3 years ago |
|
haroon amjad
|
a918d409fb
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
3 years ago |
|
haroon amjad
|
32edb2e71e
|
updates
|
3 years ago |
|
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
3 years ago |
|
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
3 years ago |
|
haroon amjad
|
cbf49e31a1
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
3 years ago |
|
haroon amjad
|
2a343db335
|
updates
|
3 years ago |
|
haroon amjad
|
736edad018
|
OB Gyne appo updates
|
3 years ago |
|
haroon amjad
|
4b4ac4819f
|
no message
|
3 years ago |
|
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
3 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
3 years ago |
|
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
3 years ago |
|
haroon amjad
|
a6c6651363
|
Updates & fixes
|
3 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
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
3 years ago |
|
haroon amjad
|
7f5f3ababe
|
Registration fix
|
3 years ago |
|
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
e45c2c5652
|
covid & pharmacy updates
|
3 years ago |
|
haroon amjad
|
eb6b0aefc0
|
Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!580
|
3 years ago |
|
haroon amjad
|
7dbc00a864
|
ancillary orders update
|
3 years ago |
|
haroon amjad
|
693f8cb090
|
Updates & fixes
|
3 years ago |
Fatimah Alshammari
|
f83adbc6ff
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
3 years ago |
|
Fatimah Alshammari
|
0b21252ae7
|
fix category issue
|
3 years ago |
|
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
e53ba65ddd
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
3 years ago |
|
Fatimah Alshammari
|
0985436a10
|
fix translation issue
|
3 years ago |
|
haroon amjad
|
4e3d99b007
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
6d88607631
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
3 years ago |
|
haroon amjad
|
2670d0be57
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
3 years ago |
|
Fatimah Alshammari
|
b09b1e4732
|
six issues
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
3 years ago |
|
haroon amjad
|
207525e31a
|
Fixes
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
3 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
3 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
|
3 years ago |
|
Elham Rababh
|
d6eeb02c91
|
fix on design
|
3 years ago |
|
haroon amjad
|
d1fcdcc898
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
3 years ago |
|
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
3 years ago |
|
Elham Rababh
|
c6be53d800
|
first step from product details
|
3 years ago |
|
Elham Rababh
|
a71e7e4075
|
first step from product details
|
3 years ago |
|
Elham Rababh
|
34596163d1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
3 years ago |
|
Elham Rababh
|
12e47aba82
|
fix as first step
|
3 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
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
a858d8764a
|
fixed issues
|
3 years ago |
devmirza121
|
f9e98c5fa4
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
devmirza121
|
7d2a6c794b
|
Clinic Search Dialog
|
3 years ago |
|
haroon amjad
|
4b446bb6d0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
 Sikander Saleem
|
407fb81038
|
Merge branch 'development_new_design_2.0' into new_design_sikander
|
3 years ago |
|
Sikander Saleem
|
7df0fc59df
|
laser images change & offer and packages
|
3 years ago |
|
haroon amjad
|
5f0985adaa
|
Updates
|
3 years ago |
|
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
3 years ago |
|
haroon amjad
|
68294690a1
|
prescription reminders added
|
3 years ago |
|
devmirza121
|
f3b7a5c318
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
devmirza121
|
69b1dd6533
|
Medical Reminder
|
3 years ago |
|
Sikander Saleem
|
044c442ce0
|
Merge branch 'development_new_design_2.0' into new_design_sikander
# Conflicts:
# lib/pages/parent_categorise_page.dart
|
3 years ago |
|
Sikander Saleem
|
5a8c887117
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
3 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
|
3 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
|
3 years ago |
|
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
3 years ago |
|
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
3 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
|
3 years ago |
|
Fatimah Alshammari
|
adfa707eda
|
fix issue
|
3 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
|
3 years ago |
|
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
3 years ago |
|
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
3 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
3 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
|
3 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
|
3 years ago |
|
devmirza121
|
6575456d3b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
devmirza121
|
dc3d3bc772
|
Health Calculator 5.0
|
3 years ago |
|
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
3 years ago |
|
haroon amjad
|
70304427f9
|
Doc specialty fix
|
3 years ago |
|
devmirza121
|
590b795356
|
Health Calculator 4.0 marge
|
3 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
|
3 years ago |
|
devmirza121
|
1d1708bdcc
|
Health Calculator 4.0
|
3 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
|
3 years ago |
|
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
3 years ago |
|
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
3 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
|
3 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
|
3 years ago |
|
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
3 years ago |
|
devmirza121
|
6225f2468d
|
Health Calculator 3.0
|
3 years ago |
|
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
3 years ago |
|
devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
3 years ago |
|
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
3 years ago |
|
haroon amjad
|
894cc0e336
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
e1e31de818
|
Lakum fixes
|
3 years ago |