 haroon amjad
|
c5e88ac7ba
|
fixes
|
2 years ago |
|
haroon amjad
|
f0a4bd6925
|
Commented the CRs code
|
2 years ago |
|
haroon amjad
|
3f6c05825d
|
updates
|
2 years ago |
|
haroon amjad
|
4e962bda07
|
Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/service/medical/ask_doctor_services.dart
# lib/core/service/medical/labs_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/pages/conference/web_rtc/call_home_page_.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/pages/webRTC/call_page.dart
# lib/pages/webRTC/signaling.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/SignalRUtil.dart
# lib/uitl/utils.dart
# lib/widgets/others/floating_button_search.dart
|
2 years ago |
|
haroon amjad
|
af5b0766a2
|
CR 6654, Disable update manual insurance temporarily.
|
2 years ago |
|
haroon amjad
|
b2f390c19d
|
CR 6204 implemented
|
2 years ago |
|
haroon amjad
|
14928ad833
|
CR 6204
|
2 years ago |
|
haroon amjad
|
34d3cf2945
|
CR 6204 Lab reports enhancements in progress
|
2 years ago |
|
haroon amjad
|
df610690d5
|
updates
|
2 years ago |
|
haroon amjad
|
e780df90e1
|
updates
|
2 years ago |
|
haroon amjad
|
d8e9f36844
|
updates
|
2 years ago |
|
haroon amjad
|
c0595a8dc6
|
updates
|
2 years ago |
Sultan khan
|
abcf82346e
|
Excluded change
|
2 years ago |
|
haroon amjad
|
9ed454f67a
|
Cash patient check implemented
|
2 years ago |
|
haroon amjad
|
49963911ba
|
Patient eligibility change
|
2 years ago |
|
haroon amjad
|
4dd16bde59
|
Inpatient medical report fixes
|
2 years ago |
|
haroon amjad
|
a58e4452b8
|
ancillary changes
|
2 years ago |
|
haroon amjad
|
38661621e3
|
updates & fixes
|
2 years ago |
|
haroon amjad
|
6f20f1b871
|
InPatient Discharge Medications
|
2 years ago |
|
haroon amjad
|
72ee34f9a7
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
haroon amjad
|
275c99a4ce
|
updates
|
2 years ago |
|
haroon amjad
|
0f863cd259
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
652c19cdf8
|
updates
|
2 years ago |
|
haroon amjad
|
5ddf8d4b7a
|
View Dr response fix
|
2 years ago |
|
haroon amjad
|
66600fe66c
|
Medical report CR implemented
|
2 years ago |
|
haroon amjad
|
fb9a4d5297
|
Laser clinic changes
|
2 years ago |
|
haroon amjad
|
6b121e7f39
|
Store build version 4.5.026
|
2 years ago |
|
haroon amjad
|
75685b1f61
|
Project selection added in Laser & advance payment
|
2 years ago |
|
haroon amjad
|
e64a91855f
|
fixes
|
2 years ago |
|
haroon amjad
|
7702960bb5
|
InPatient medical report & view medical report commented out
|
2 years ago |
|
haroon amjad
|
3642ca6a47
|
InPatient advance payment updates
|
2 years ago |
|
haroon amjad
|
1300dadce1
|
Inpatient advance payment
|
2 years ago |
|
haroon amjad
|
4a7ca9cd46
|
InPatient advance payment history implemented
|
2 years ago |
|
haroon amjad
|
2bf8d454f5
|
updates
|
2 years ago |
|
haroon amjad
|
c58e180c91
|
Updates
|
2 years ago |
|
haroon amjad
|
965df33253
|
Appointment actions fixes
|
2 years ago |
|
haroon amjad
|
7c68779324
|
Nphies integration
|
2 years ago |
|
haroon amjad
|
3e63d80655
|
Ancillary order updates
|
2 years ago |
|
haroon amjad
|
ae0fca865d
|
InPatient Advance payment API implemented
|
2 years ago |
|
haroon amjad
|
a9ae44ca89
|
Implemented checks for InPatient CR
|
2 years ago |
|
haroon amjad
|
2455f48fe1
|
View medical report done
|
2 years ago |
|
haroon amjad
|
dd79b1dfca
|
InPatient pending advance payment done
|
2 years ago |
|
haroon amjad
|
4afdf5545e
|
Translations added
|
2 years ago |
|
haroon amjad
|
d251ca0e1c
|
Inpatient medical instructions implemented
|
2 years ago |
|
haroon amjad
|
786dd76f57
|
updates
|
2 years ago |
|
haroon amjad
|
3353c93de9
|
fixes
|
2 years ago |
|
haroon amjad
|
da0a164b0e
|
updates
|
2 years ago |
|
haroon amjad
|
a17b941c63
|
InPatient Medical Report continued
|
2 years ago |
|
haroon amjad
|
9b3c07d3b1
|
Added AED in advance payment
|
2 years ago |
|
haroon amjad
|
657248803f
|
Ask doc disabled for LiveCare appointments
|
2 years ago |
|
haroon amjad
|
d261557cd7
|
Admitted patient API changed
|
2 years ago |
|
haroon amjad
|
ff23f3a8cb
|
fixes
|
2 years ago |
|
haroon amjad
|
f624c70cee
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
a60f66a069
|
Updates
|
2 years ago |
|
haroon amjad
|
3fb8876c31
|
Manual Insurance Card Update
|
2 years ago |
|
haroon amjad
|
fe606b7823
|
InPatient Advance Payment
|
2 years ago |
|
haroon amjad
|
1eccaf0aac
|
Regex added to allow characters only.
|
2 years ago |
|
haroon amjad
|
1a45dd57e9
|
LiveCare Fix
|
2 years ago |
|
haroon amjad
|
047877fb08
|
Add Doctor response rate comments validation
|
2 years ago |
|
haroon amjad
|
20572f463a
|
meal plan dev completed
|
2 years ago |
|
Sultan khan
|
5d6b50a1da
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
|
2 years ago |
|
Sultan khan
|
83859e05f1
|
family file approve reject button refresh
|
2 years ago |
|
haroon amjad
|
0e054429ef
|
Meal Plan implementation completed
|
2 years ago |
|
haroon amjad
|
d9404d3abe
|
Medical Report changes
|
2 years ago |
|
haroon amjad
|
bc27121c4e
|
meal plan updates
|
2 years ago |
|
haroon amjad
|
96f948a8c8
|
updates
|
2 years ago |
|
haroon amjad
|
94296cec0d
|
meal plan continued
|
2 years ago |
|
haroon amjad
|
38648df897
|
Meal Plan development continued
|
2 years ago |
|
haroon amjad
|
d073eb9d5f
|
MealPlan implementation continued
|
2 years ago |
|
haroon amjad
|
77ab9373f8
|
Meal Plan APIs implementation continued
|
2 years ago |
|
haroon amjad
|
b337343df3
|
Project ID fix in ancillary orders
|
2 years ago |
|
haroon amjad
|
710e6274db
|
mealplan updates
|
2 years ago |
|
haroon amjad
|
9f44b25353
|
Meal Plan API integration in progress
|
2 years ago |
|
haroon amjad
|
7bc105c6c7
|
updates
|
2 years ago |
|
haroon amjad
|
6877244d0e
|
CR# 5805 Ask Doc Improvements dev completed.
|
2 years ago |
|
haroon amjad
|
e4fe4baa27
|
nearest appo crash fixed
|
2 years ago |
|
haroon amjad
|
83ca5e8e4c
|
ask doctor date param added
|
2 years ago |
|
haroon amjad
|
58e598843b
|
sickleave
|
2 years ago |
|
haroon amjad
|
2d93b9753d
|
Ask doctor improvements
|
2 years ago |
|
haroon amjad
|
f28fcbd006
|
AdvanceNumber_VP added
|
2 years ago |
|
haroon amjad
|
17acae0a95
|
updates
|
2 years ago |
|
haroon amjad
|
101f2dcab8
|
updates
|
2 years ago |
|
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
2 years ago |
|
haroon amjad
|
078482c21d
|
updates
|
2 years ago |
|
haroon amjad
|
cf30762eec
|
updates
|
2 years ago |
|
haroon amjad
|
420aef3195
|
Updates
|
2 years ago |
|
haroon amjad
|
2437d2da9c
|
Updates
|
2 years ago |
|
haroon amjad
|
01ee9a2710
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
|
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
2 years ago |
|
haroon amjad
|
17e7886907
|
VidaPlus Project changes
|
2 years ago |
|
haroon amjad
|
a7a06f4083
|
Home page change
|
2 years ago |
|
haroon amjad
|
b64ba9211e
|
Inpatient services in dev
|
2 years ago |
|
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
2 years ago |
|
haroon amjad
|
2fea4b2b07
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
|
2 years ago |
|
haroon amjad
|
15c4f016df
|
update to stores for version 10.5
|
2 years ago |
|
haroon amjad
|
badc13d41a
|
sickleave CR Enabled
|
2 years ago |
|
Sultan khan
|
83c15196c8
|
VIDA PLUS CHANGE
|
2 years ago |
|
Sultan khan
|
ddcd0bb73c
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into PatientApp_VIDA_Plus_3.3
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/others/bottom_bar.dart
# lib/widgets/others/floating_button_search.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
fcf0c589a0
|
Updates & fixes
|
2 years ago |
|
haroon amjad
|
b304332526
|
Patient app release to stores 10.4
|
3 years ago |
|
haroon amjad
|
872095c51f
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
|
3 years ago |
|
haroon amjad
|
5a741bf270
|
Sickleave changes
|
3 years ago |
|
Sultan khan
|
ad068d4f09
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
|
3 years ago |
|
Sultan khan
|
d59e436a97
|
dubai arabic change
|
3 years ago |
|
haroon amjad
|
907d05c3d0
|
register
|
3 years ago |
|
haroon amjad
|
9d2df00d87
|
Get General instructions implemented
|
3 years ago |
|
Sultan khan
|
baec968ae0
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v3.3
# Conflicts:
# lib/pages/login/register-info.dart
|
3 years ago |
|
Sultan khan
|
c48f393f95
|
Dubai registration fixed
|
3 years ago |
|
haroon amjad
|
0e4e285954
|
InPatient CR dev
|
3 years ago |
|
haroon amjad
|
701eedf147
|
updates
|
3 years ago |
|
haroon amjad
|
670991eca4
|
Lab result fix
|
3 years ago |
|
haroon amjad
|
9a7d0af6ea
|
InPatient API implemented
|
3 years ago |
|
haroon amjad
|
af90ab3aa3
|
Sickleave & chart changes
|
3 years ago |
|
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
|
haroon amjad
|
dc859b01f7
|
updates & fixes
|
3 years ago |
haroon amjad
|
dfc2889df7
|
dental reschedule fix
|
3 years ago |
|
haroon amjad
|
f45c5de526
|
Merge branch 'sultan_v3.3' into development_v3.3
|
3 years ago |
|
Sultan khan
|
47702b5c01
|
Merge branch 'development_v3.3' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_v3.3
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
Sultan khan
|
ea82219e9e
|
Appointment logs
|
3 years ago |
|
haroon amjad
|
6e9cc39269
|
Dental fixes
|
3 years ago |
|
haroon amjad
|
62b9b3e35c
|
calendar permission handled in iOS
|
3 years ago |
|
haroon amjad
|
63426a691d
|
Ancillary orders family members issue resolved
|
3 years ago |
|
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
|
haroon amjad
|
3bc09f792a
|
Pharma LiveCare fixes
|
3 years ago |
|
haroon amjad
|
bc8a979438
|
Upload to stores
|
3 years ago |
|
haroon amjad
|
a20d6c7c28
|
Livecare updates
|
3 years ago |
|
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |
|
haroon amjad
|
da423fe12a
|
Pharma LiveCare updates
|
3 years ago |
|
haroon amjad
|
f686013692
|
Pharma LiveCare updates
|
3 years ago |
|
haroon amjad
|
4f50c3ff8e
|
Pharmacy LiveCare revamped
|
3 years ago |
|
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
8e14084467
|
updates
|
3 years ago |
|
haroon amjad
|
98abc5a069
|
updates
|
3 years ago |
|
Sultan khan
|
9683b3f42f
|
Dubai Reminder fixed.
|
3 years ago |
|
haroon amjad
|
6bdb7a3305
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
|
haroon amjad
|
e50a67ea12
|
Vida Plus changes
|
3 years ago |
|
haroon amjad
|
2e72d6a550
|
LiveCare contact added
|
3 years ago |
|
haroon amjad
|
aafdf3760d
|
added sick leave status text & color
|
3 years ago |
|
haroon amjad
|
c8ec536267
|
Sickleave CR done
|
3 years ago |
|
haroon amjad
|
e5e5bb5352
|
Dental book appointment changes
|
3 years ago |
|
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
3 years ago |
|
haroon amjad
|
c289afb186
|
Opentok fixes
|
3 years ago |
|
haroon amjad
|
22274ebbb0
|
updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
|
haroon amjad
|
22a0e456bc
|
Manual Insurance Updates, Service ID fixes, Tamara Fixes
|
3 years ago |
|
haroon amjad
|
e80ac2481a
|
Ancillary order & manual insurance update
|
3 years ago |
|
haroon amjad
|
442a94ac08
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
3709ebcb32
|
Updates
|
3 years ago |
|
haroon amjad
|
f6191d9bf7
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
7ae4e7d616
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
d75615a2eb
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
3 years ago |
|
haroon amjad
|
106334c9cf
|
updates & fixes
|
3 years ago |
|
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
|
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
3 years ago |
|
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
|
haroon amjad
|
8be9d3ae6e
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
3 years ago |
|
haroon amjad
|
833818e6e3
|
Rad & Lab email issues fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
8c29b5f8e6
|
WebRTC or Opentok
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
8bd5a71318
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Timezone fixes & Activate/Deactivate file changes
Updates
Timezone Updates
CMC Updates
updates
Updates
Laser Male back image added
Updates & fixes
E-Cens sign off
Analtyics at registration and liveacare payment fail
analytics events update
Analytics
no message
Updates & fixes
ED Online Check-In
Calendar fixes
updates & fixes
Analytics statements align to bottom of block
Analytics for login registration
updates
# Conflicts: Fixed
# lib/analytics/flows/appointments.dart
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
1aabf08417
|
no message
|
3 years ago |
|
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
3 years ago |
|
haroon amjad
|
3896f02d13
|
Timezone Updates
|
3 years ago |
|
haroon amjad
|
ca43849d9d
|
CMC Updates
|
3 years ago |
|
haroon amjad
|
11529c65c5
|
updates
|
3 years ago |
|
haroon amjad
|
4ba229c436
|
Updates
|
3 years ago |
|
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
e615ca1a16
|
no message
|
3 years ago |
haroon amjad
|
72654757c4
|
Merge branch 'development_v2.5' into 'zik_development_v2.5'
# Conflicts:
# lib/pages/login/confirm-login.dart
|
3 years ago |
|
haroon amjad
|
7018696328
|
E-Cens sign off
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
a69e0da77d
|
Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
analytics events update
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
7051b3ed63
|
Analtyics at registration and liveacare payment fail
|
3 years ago |
|
haroon amjad
|
4cbccd8efb
|
analytics events update
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
a01b8b82da
|
no message
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
86363a15d6
|
Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
Updates & fixes
ED Online Check-In
Calendar fixes
updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
5c32e488d0
|
no message
|
3 years ago |
|
haroon amjad
|
3396b4253b
|
Updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
6cd660184a
|
no message
|
3 years ago |
|
haroon amjad
|
8b7a6e7689
|
ED Online Check-In
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
f42e2fb652
|
Revert "no message"
This reverts commit da7884ff61.
|
3 years ago |
|
haroon amjad
|
bbb99667f8
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
3 years ago |
|
haroon amjad
|
27c6837f25
|
updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
1523fd5ade
|
Analytics for login registration
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
da7884ff61
|
no message
|
3 years ago |
|
haroon amjad
|
f50bfda330
|
updates
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
a0e619eec6
|
fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
88b904a4b8
|
analytics changes
|
3 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
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
8a95daff7c
|
Google analytics events update
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
e107d8a1a4
|
no message
|
3 years ago |
|
haroon amjad
|
1faf27959a
|
Updates
|
3 years ago |
|
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
842e099953
|
DateTime Fixes
|
3 years ago |
|
haroon amjad
|
a9e48e487f
|
HHC Fixes
|
3 years ago |
|
haroon amjad
|
f1129cc14c
|
updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
612d9eb019
|
Project Filter Applied on Packages & Offers
|
3 years ago |
|
haroon amjad
|
fd96869d89
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
3 years ago |
|
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
94a99a911e
|
Offer And Packages (View Only)
|
3 years ago |
|
haroon amjad
|
8d988ba994
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
4ba37d342c
|
RRT Updates
|
4 years ago |
|
haroon amjad
|
72e5d0a2be
|
Pharma LiveCare
|
4 years ago |
|
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
|
haroon amjad
|
643763764d
|
family files fixes
|
4 years ago |
|
haroon amjad
|
be2a9380df
|
Analytics change
|
4 years ago |
|
haroon amjad
|
9464d543fc
|
updates
|
4 years ago |
|
haroon amjad
|
bc97cfa95b
|
Update Insurance changes
|
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 |
|
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
|
687bc543ab
|
OpenTok Video Call
|
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
|
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
|
f8b3847d0a
|
Ancillary Orders completed
|
4 years ago |
|
haroon amjad
|
ea8d700d22
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
efced34ffa
|
Updates
|
4 years ago |