Sultan khan
|
4338da513d
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/core/model/labs/request_patient_lab_special_result.dart
# lib/core/model/labs/request_send_lab_report_email.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.dart
# lib/core/model/rate/appoitment_rated.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/service/medical/radiology_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/models/Authentication/check_activation_code_request.dart
# lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/DrawerPages/notifications/notification_details_page.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/services/authentication/auth_provider.dart
# lib/splashPage.dart
# lib/uitl/push-notification-handler.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
2 years ago |
haroon amjad
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
devamirsaleemahmad
|
d6f51f6c82
|
changes
|
2 years ago |
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
2 years ago |
devamirsaleemahmad
|
49d3df8c87
|
changes
|
2 years ago |
devamirsaleemahmad
|
47801ecb36
|
changes
|
2 years ago |
devamirsaleemahmad
|
c1fd6313b1
|
changes
|
2 years ago |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
2 years ago |
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
3 years ago |
haroon amjad
|
a60f66a069
|
Updates
|
3 years ago |
haroon amjad
|
1a45dd57e9
|
LiveCare Fix
|
3 years ago |
haroon amjad
|
b304332526
|
Patient app release to stores 10.4
|
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
|
6bdb7a3305
|
Updates & fixes
|
3 years ago |
haroon amjad
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
haroon amjad
|
2e72d6a550
|
LiveCare contact added
|
3 years ago |
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
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
|
3709ebcb32
|
Updates
|
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
|
4 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
8c29b5f8e6
|
WebRTC or Opentok
|
4 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
|
4 years ago |
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
4 years ago |
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
7051b3ed63
|
Analtyics at registration and liveacare payment fail
|
4 years ago |
Zohaib Iqbal Kambrani
|
6cd660184a
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
4 years ago |
haroon amjad
|
f50bfda330
|
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
a0e619eec6
|
fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
88b904a4b8
|
analytics changes
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
8a95daff7c
|
Google analytics events update
|
4 years ago |
Zohaib Iqbal Kambrani
|
e107d8a1a4
|
no message
|
4 years ago |
haroon amjad
|
1faf27959a
|
Updates
|
4 years ago |
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
4 years ago |
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
4 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
haroon amjad
|
8c96de866b
|
updates
|
4 years ago |
haroon amjad
|
7d7864a1eb
|
livecare changes
|
4 years ago |
Zohaib Iqbal Kambrani
|
23404b4495
|
Video call at InAppWebView
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
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
|
40d649dfa4
|
Updates & fixes
|
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 |
Zohaib Iqbal Kambrani
|
63ffabcc86
|
no message
|
4 years ago |
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
Sikander Saleem
|
caec2c4ca4
|
video call improvements.
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
4 years ago |
haroon amjad
|
fe7baeab3c
|
LiveCare permissions
|
4 years ago |
Sikander Saleem
|
4518a26ff1
|
video call improvement.
|
4 years ago |
haroon amjad
|
2c198ed224
|
no message
|
4 years ago |
haroon amjad
|
c253ec3110
|
LiveCare UI revamped
|
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 |
haroon amjad
|
57ea450662
|
LiveCare Schedule fixes
|
4 years ago |
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
4 years ago |
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
4 years ago |
haroon amjad
|
7123ed34ab
|
Translation updates
|
4 years ago |
Mirza.Shafique
|
fd26a59b2d
|
live care design 1.0
|
4 years ago |
haroon amjad
|
2cff7c3246
|
LiveCare design fixes
|
4 years ago |
haroon amjad
|
e913316c54
|
Updates
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
4 years ago |
haroon amjad
|
07a98d75c6
|
My tracker fixes
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
haroon amjad
|
a4a2389a78
|
updates & fixes
|
4 years ago |
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
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 |
Mirza.Shafique
|
ef2bcc1c65
|
Web RTC Design implementation
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
haroon amjad
|
0fe4a21388
|
updates & fixes
|
5 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
5 years ago |
Sikander Saleem
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
5 years ago |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
5 years ago |
haroon amjad
|
a10253736a
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/pages/login/confirm-login.dart
# lib/pages/login/login.dart
|
5 years ago |
haroon amjad
|
44d59ed01a
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
5 years ago |