taha.alam
82d54e78c9
Merge remote-tracking branch 'origin/lab_result' into lab_result
...
# Conflicts:
# lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart
7 months ago
taha.alam
85c8f5466f
duplicate value removed
7 months ago
taha.alam
6596e38b09
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into lab_result
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart
7 months ago
taha.alam
b6d310c65f
WD: bottom date titles are added with custom height and maxX
7 months ago
haroon amjad
8348557254
Bottom safe area for android
7 months ago
haroon amjad
a13c2e6c31
rebase update branch into lab_result
7 months ago
taha.alam
dd1c3a462a
WD: bottom date titles are added with custom height and maxX
7 months ago
haroon amjad
a6164c6c6b
updates
7 months ago
haroon amjad
afd7c5db81
updates
7 months ago
taha.alam
880db9315e
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into lab_result
...
# Conflicts:
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
7 months ago
taha.alam
ab210552f0
lab items are added as cureved and side ranges changed
7 months ago
haroon amjad
d42b7108a3
Bottom safe area for android
7 months ago
haroon amjad
6b70461e27
biometric icon & text update
7 months ago
taha.alam
9a23b7dd7c
init state issue resolve
7 months ago
Haroon6138
8fd0d13339
Merge pull request 'lab_result' ( #2 ) from lab_result into update-to-3.32-sdk
...
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App/pulls/2
7 months ago
taha.alam
a68da808da
updating the percentage if the screen dimens are changed.
7 months ago
taha.alam
e441d0d6ce
WD: Lab result values adjusted for tablet and normal devices.
7 months ago
taha.alam
8e98976a65
lab result value updated
7 months ago
haroon amjad
4168c866d5
updates
7 months ago
haroon amjad
f265c605ca
Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
...
# Conflicts:
# android/app/local.properties
# android/app/src/main/AndroidManifest.xml
# android/gradle.properties
# android/gradle/wrapper/gradle-wrapper.properties
# ios/Podfile
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# ios/Runner/Info.plist
# ios/Runner/Runner.entitlements
# lib/config/localized_values.dart
# lib/core/model/labs/LabOrderResult.dart
# lib/core/model/labs/lab_result.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/labs_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/core/viewModels/project_view_model.dart
# lib/new_ui/exception_widget/ExceptionBottomSheet.dart
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/forgot-password.dart
# lib/pages/login/register_new.dart
# lib/pages/login/saved_login.dart
# lib/pages/login/welcome.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/uitl/app_toast.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
# lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/pickupLocation/PickupLocationFromMap.dart
# pubspec.yaml
7 months ago
haroon amjad
edfcaf1743
updates
7 months ago
haroon amjad
34d298a81a
lab results updates & fixes
7 months ago
haroon amjad
981089632f
direction fix
7 months ago
Sultan khan
c0d3bd569b
no message
7 months ago
haroon amjad
97c7b1c225
updates & fixes
7 months ago
haroon amjad
7b6395cc49
Merge branch 'dev_v3.13.6_CR_7211_Lab_report_changes' into merge-update-with-lab-changes
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
7 months ago
Sultan khan
e689826730
login fixes
7 months ago
Sultan khan
29675e3058
no message
7 months ago
Aamir Muhammad
00e34078b4
fixes
7 months ago
Aamir Muhammad
24a4020f5c
fixes
7 months ago
Aamir Muhammad
c3b8ec6067
fixes
7 months ago
Sultan khan
80b8084a7f
no message
7 months ago
Aamir Muhammad
e64d1088a6
changes
7 months ago
Aamir Muhammad
ff12e832ab
fixes
7 months ago
haroon amjad
a565a1da1b
updates & fixes
7 months ago
Aamir Muhammad
4792de96d8
changes
7 months ago
Sultan khan
aac6eaa58a
design
7 months ago
Sultan khan
b606708c30
design
7 months ago
Aamir Muhammad
2245135316
changes
7 months ago
Aamir Muhammad
3c7c738b12
changes
7 months ago
Aamir Muhammad
462b5df7f9
Exception Widget & Fixes
7 months ago
Aamir Muhammad
a7e310226e
Exception Widget & Fixes
7 months ago
haroon amjad
8c8665a2f0
updates
7 months ago
Aamir Muhammad
2e01429221
Exception Widget & Fixes
7 months ago
Aamir Muhammad
86d63620a1
fixes for login & register (Points)
7 months ago
haroon amjad
e84454664b
updates & fixes
7 months ago
haroon amjad
68410d908b
updates & fixes for Huawei
7 months ago
haroon amjad
1ce35936e2
Updates
7 months ago
Aamir Muhammad
f04928c3e8
fixes for login & register (Points)
7 months ago
Aamir Muhammad
ee4ae657b0
fixes
7 months ago
Sultan khan
ef8532b1c5
updated login flow
7 months ago
Aamir Muhammad
b60bfde04f
saved login fixes & design changes.
7 months ago
Aamir Muhammad
e306bfd69b
saved login fixes & design changes.
7 months ago
Aamir Muhammad
23fc89b40a
font changes
7 months ago
Aamir Muhammad
6b96b6fc9e
ui fixes
7 months ago
Aamir Muhammad
9704ef232f
caleder changes
7 months ago
Sultan khan
ecad464b82
no message
7 months ago
Sultan khan
890ff874e3
registration updated.
7 months ago
Aamir Muhammad
a05cea7c8b
registration fixes
7 months ago
Aamir Muhammad
f2059aa00e
otp Design.
7 months ago
Sultan khan
6aa283942a
last login info saved.
7 months ago
Aamir Muhammad
2dd823667c
register Design.
7 months ago
Sultan khan
ba6dc2ec9c
last login changes done.
7 months ago
Sultan khan
007f17369b
savedlogin
7 months ago
Sultan khan
5b45855cf6
saved login created
7 months ago
Sultan khan
1d98dbc67b
quick login enable
7 months ago
Aamir Muhammad
93649616b2
translation & register Design changes.
7 months ago
Aamir Muhammad
16b37b847d
translation & register Design changes.
7 months ago
Aamir Muhammad
2d5b4342a1
tweaks
7 months ago
Aamir Muhammad
dac43376e0
tweaks
7 months ago
Aamir Muhammad
801a2578ab
lottie & bottom sheet
7 months ago
Aamir Muhammad
90eea4d0d7
consumer on welcome & language & font
7 months ago
Aamir Muhammad
5fd4aee7ea
consumer on welcome & language & font
7 months ago
Aamir Muhammad
dbfa3c7cee
consumer on welcome & language & font
7 months ago
Aamir Muhammad
1282b5a415
consumer on welcome & language & font
7 months ago
Aamir Muhammad
e9d35d8333
login using sms done
7 months ago
Aamir Muhammad
6578baaf34
login using sms done
7 months ago
Aamir Muhammad
7ff7f88e24
updated app to latest flutter sdk with android native changes.
7 months ago
Aamir Muhammad
aa0eea22ee
updated app to latest flutter sdk with android native changes.
7 months ago
Aamir Muhammad
9b441a14eb
updated app to latest flutter sdk with android native changes.
7 months ago
Aamir Muhammad
4aa54385d3
updated app to latest flutter sdk with android native changes.
7 months ago
Aamir Muhammad
cce7ac1120
updated app to latest flutter sdk.
7 months ago
Aamir Muhammad
a7f53d3b3c
updated app to latest flutter sdk.
7 months ago
Syed Taha Alam
656d8dd6b4
Wd: Full portrait graph added.
7 months ago
haroon amjad
e748712954
Initial Commit
7 months ago
Sultan khan
8881e9c0c7
login fixes
7 months ago
Syed Taha Alam
c09170b506
Wd: Lab result graph completed.
8 months ago
Sultan khan
1581aff4b5
no message
8 months ago
Aamir Muhammad
62fcb9f1e0
fixes
8 months ago
Aamir Muhammad
2346195844
fixes
8 months ago
Aamir Muhammad
297eef9558
fixes
8 months ago
Sultan khan
334508963c
no message
8 months ago
Aamir Muhammad
c666ba219c
changes
8 months ago
Aamir Muhammad
e571248b8d
fixes
8 months ago
haroon amjad
4b5a3af4cd
updates & fixes
8 months ago
Aamir Muhammad
1aab92b50a
changes
8 months ago
Sultan khan
aa8852f7a0
design
8 months ago
Sultan khan
4a99593990
design
8 months ago
Aamir Muhammad
0fadf3e49c
changes
8 months ago
Syed Taha Alam
5461d78a1b
Wd: graph added with the threshold
8 months ago
Aamir Muhammad
bd4400e32f
changes
8 months ago
Aamir Muhammad
e6dad37ca3
Exception Widget & Fixes
8 months ago
Aamir Muhammad
4d4e7e5a5b
Exception Widget & Fixes
8 months ago
Aamir Muhammad
e6ed6329ea
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
8 months ago
Aamir Muhammad
5dfa9bafb9
Exception Widget & Fixes
8 months ago
haroon amjad
3f5ba0cfcd
updates
8 months ago
Aamir Muhammad
ec0e51c96c
fixes for login & register (Points)
8 months ago
Aamir Muhammad
c49dbbb436
Merge branch 'master' into update-to-3.32-sdk
...
# Conflicts:
# lib/pages/livecare/incoming_call.dart
# pubspec.yaml
8 months ago
haroon amjad
18b56d6496
updates & fixes
8 months ago
haroon amjad
936ae7b131
updates & fixes for Huawei
8 months ago
Aamir Muhammad
8028617398
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
8 months ago
Aamir Muhammad
bdaef7f89c
fixes for login & register (Points)
8 months ago
haroon amjad
90ec43f8b0
Updates
8 months ago
Aamir Muhammad
fd0635764d
fixes
8 months ago
Sultan khan
dd97a27494
updated login flow
8 months ago
Aamir Muhammad
af2bf1314e
saved login fixes & design changes.
8 months ago
Aamir Muhammad
da32bd8df1
saved login fixes & design changes.
8 months ago
Aamir Muhammad
54d17d2c16
font changes
8 months ago
Aamir Muhammad
f0a80f7a25
ui fixes
8 months ago
Aamir Muhammad
0ac06092c2
caleder changes
8 months ago
Sultan khan
7f78e2caa8
no message
9 months ago
Sultan khan
bb15f5155e
registration updated.
9 months ago
Aamir Muhammad
dff06e34a9
registration fixes
9 months ago
Sultan khan
2a0bcdcd11
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Sultan khan
4c42c0ab20
last login info saved.
9 months ago
Aamir Muhammad
288f10a93e
otp Design.
9 months ago
Sultan khan
fdc97c08a9
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Sultan khan
561856f4bd
last login changes done.
9 months ago
Aamir Muhammad
1c954391c9
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Sultan khan
7d440b4024
savedlogin
9 months ago
Aamir Muhammad
0194ab9189
register Design.
9 months ago
Aamir Muhammad
b2cf18a672
translation & register Design changes.
9 months ago
Aamir Muhammad
d38a36bbb9
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
9 months ago
Aamir Muhammad
3ee1ca8ebf
translation & register Design changes.
9 months ago
Sultan khan
f399ddabf6
saved login created
9 months ago
Aamir Muhammad
1483b0c3b6
translation & register Design changes.
9 months ago
Sultan khan
9c0ee71398
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
...
# Conflicts:
# lib/pages/login/welcome.dart
9 months ago
Aamir Muhammad
88f2b5311a
tweaks
9 months ago
Sultan khan
4303a5c9d0
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Aamir Muhammad
1971a38495
tweaks
9 months ago
Aamir Muhammad
a95c272daf
lottie & bottom sheet
9 months ago
Sultan khan
02107066da
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Aamir Muhammad
bf1eec0dc3
consumer on welcome & language & font
9 months ago
Sultan khan
85ca2373e5
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Aamir Muhammad
4245804949
consumer on welcome & language & font
9 months ago
Aamir Muhammad
ec03ac7439
consumer on welcome & language & font
9 months ago
Sultan khan
41f941b6d9
Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk
9 months ago
Sultan khan
609cda40d5
no message
9 months ago
Sultan khan
4d2efee297
quick login enable
9 months ago
Aamir Muhammad
c0fad68e74
consumer on welcome & language & font
9 months ago
Syed Taha Alam
e79c521ea9
Wd: Result type id 5 is toggle the visibility of the graph of the lab result screen.
9 months ago
Aamir Muhammad
00f1c46d02
login using sms done
9 months ago
Aamir Muhammad
cb9e152c01
login using sms done
9 months ago
Aamir Muhammad
0d3cf1b3c8
updated app to latest flutter sdk with android native changes.
9 months ago
Aamir Muhammad
bb7e9e5a7b
updated app to latest flutter sdk with android native changes.
9 months ago
Aamir Muhammad
3558e4231f
updated app to latest flutter sdk with android native changes.
9 months ago
Aamir Muhammad
8f8769d99a
updated app to latest flutter sdk with android native changes.
9 months ago
Aamir Muhammad
a0ef3cec36
updated app to latest flutter sdk.
9 months ago
Aamir Muhammad
5fb40a7c5f
updated app to latest flutter sdk.
9 months ago
haroon amjad
dbfe9663a5
Merge branch 'dev_v3.13.6' into dev_v3.13.6_CR_7211_Lab_report_changes
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# pubspec.yaml
10 months ago
haroon amjad
c1dae542c9
tamara fix
10 months ago
haroon amjad
220c954a4a
updates
10 months ago
Syed Taha Alam
303e9114a3
Wd: Nearest appointemtn added in search by hospital
10 months ago
haroon amjad
fff45cd3a8
Update to stores VersionID 18.6
10 months ago
haroon amjad
1ee86d0813
PDF report implemented for Lab, Rad, Prescription, SickLeave & Medical Report.
11 months ago
haroon amjad
0c3ef15895
Privacy policy updates
11 months ago
haroon amjad
f7599a47e7
LiveCare Phone Call type Mobile number edit field disabled as per Mr Rwaid's instructions.
11 months ago
haroon amjad
a0528da4cd
fix for medical report & user agreement page
11 months ago
haroon amjad
cb68731679
updates & fixes
11 months ago
haroon amjad
f56a1627db
updates & fixes
11 months ago
haroon amjad
260edfa303
update to stores, VersionID 18.4
11 months ago
haroon amjad
5fc939bf1e
Merge branch 'dev_v3.13.6_deep_link' into dev_v3.13.6
11 months ago
haroon amjad
f621f8c8d1
fixes
11 months ago
taha.alam
f8a66a58f8
WD:new deeplink schema added. make it compatible to link as follows:
...
* with https http and www
* without www and containing http or https
* only link e.g hmg.com/navigate
11 months ago
Syed Taha Alam
57415bd670
Merge remote-tracking branch 'origin/dev_v3.13.6_deep_link' into dev_v3.13.6_deep_link
11 months ago
Syed Taha Alam
390455e5a2
deeplink done
11 months ago
taha.alam
ec96fecf2f
WD:deeplink changes.
11 months ago
taha.alam
bdcda02b26
WD:deeplink changes.
11 months ago
taha.alam
68eab7639c
Merge dev_3.13.6 to deep_link
11 months ago
haroon amjad
cb7a444d83
fixes
11 months ago
haroon amjad
c1212c2c6a
Dental updates & fixes, Update to stores VersionID 18.3
11 months ago
haroon amjad
4564b42018
updates & fixes
11 months ago
haroon amjad
d921b1d081
Merge branch 'dev_v3.13.6_search_hospital_by_region' into dev_v3.13.6
11 months ago
haroon amjad
b308079255
updates & fixes
11 months ago
haroon amjad
7a821a4604
updates
11 months ago
haroon amjad
a2dd8f2e35
no message
11 months ago
haroon amjad
4cde49cb51
er checkin changes
11 months ago
taha.alam
bbf18baade
WD: 0 count hmg or hmc will not be displayed
11 months ago
taha.alam
2e9f6bcb51
WD: show nearest doctor item different for search clinic
11 months ago
Haroon Amjad
8d23ea6fda
Release Sent to stores, VersionID 18.2
11 months ago
taha.alam
9074bf2e65
WD:location icon added.
11 months ago
taha.alam
b46eb6214e
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
11 months ago
taha.alam
4b40d5d5a0
WD: Color of hospital name will be as of the type of it.
11 months ago
taha.alam
5dbd97aa46
WD: hospital name selection change
11 months ago
Haroon Amjad
556ff02e64
update sent to stores, VersionID 18.1
11 months ago
taha.alam
e3b75b18c8
WD: stepper back button added and text directionality added.
11 months ago
taha.alam
cb8eb316ec
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
11 months ago
Syed Taha Alam
159135bb77
Wd: Item size changes.
11 months ago
taha.alam
88cd6f811a
WD: doctor screen issue changes and string changes of top bar
11 months ago
taha.alam
ca965a6d06
WD:String value change and context changes
11 months ago
taha.alam
e6fcb1fddf
WD:select hospital by region changes
12 months ago
taha.alam
951a5a4932
WD: search by region changes
12 months ago
Syed Taha Alam
ae4c287af2
new ui integrated.
12 months ago
taha.alam
8ffcebc44e
WD:deeplink changes.
12 months ago
haroon amjad
9590d268a0
Update sent to stores, VersionID 18.0
1 year ago
haroon amjad
a1600dbfce
LiveCare Terms & Conditions updated
1 year ago
haroon amjad
0dc32e061f
User agreement updates done.
1 year ago
haroon amjad
d865bd9c3b
user agreement updates
1 year ago
haroon amjad
7842f95d7b
livecare insurance navigation issue fixed
1 year ago
taha.alam
e876eaaa33
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link
...
# Conflicts:
# pubspec.yaml
1 year ago
taha.alam
d4c741e1ec
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad
21fda7987a
Updates & fixes, App uploaded to Stores VersionID 17.9
1 year ago
taha.alam
e5198f093a
Merge branch 'dev_v3.13.6_deep_link' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link
1 year ago
taha.alam
e2efc3749c
WD:deeplink changes.
1 year ago
haroon amjad
91b9e792c6
updates
1 year ago
haroon amjad
c2785c5f68
Updates & fixes
1 year ago
haroon amjad
7ed401fb1c
Riyal symbol update & sent to stores VersionID 17.8
1 year ago
haroon amjad
0706d9f5f9
App update sent to Stores VersionID 17.7
1 year ago
haroon amjad
889828d4d4
Lab report download VIDA Plus implementation
1 year ago
haroon amjad
8b74c9df61
updates
1 year ago
sultan khan
e66e42edda
next day appointment updates
1 year ago
sultan khan
b93d373c6f
next appointment updated.
1 year ago
sultan khan
2c746bf783
next day appointments change.
1 year ago
taha.alam
2c5ed4ffe7
WD:button color changed
1 year ago
taha.alam
fa1bb291b9
WD: issues fixed of description not showing
1 year ago
taha.alam
eba3ab2cf8
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/new_design/doctor_header.dart
1 year ago
taha.alam
eafb7f5f7b
WD: lab report changes along with the cross added to the FlowChartPage.dart
1 year ago
taha.alam
81ddb81b8e
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link
1 year ago
haroon amjad
3bf1e3fceb
Ask Dr error toast issue resolved
1 year ago
sultan khan
08965c72c8
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_deep_link
1 year ago
taha.alam
636a67b720
WD: lab result changes of IRR.
1 year ago
haroon amjad
b445d1d59e
image added
1 year ago
haroon amjad
1080a59106
Lab report download enabled
1 year ago
Haroon Amjad
2c5be020e9
LanguageID added in Lab Report Email API
1 year ago
haroon amjad
7d33ace5c9
images added
1 year ago
haroon amjad
f74a3301da
SAR new symbol integrated
1 year ago
haroon amjad
744e3978d3
user agreement service privilege added
1 year ago
haroon amjad
a24582a578
InPatient check added in Family file switch
1 year ago
taha.alam
9047ebf723
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_CR_7211_Lab_report_changes
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# android/build.gradle
# android/gradle.properties
# android/settings.gradle
# lib/config/localized_values.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# pubspec.yaml
1 year ago
Haroon Amjad
04413aa7d6
lab report updates
1 year ago
taha.alam
6cf86e2e84
WIP: deeplink added to android and ios
1 year ago
taha.alam
06192292d0
WD: unresolved reference issue fixed
1 year ago
taha.alam
2a37777b9a
Merge branch 'dev_v3.13.6_search_hospital_by_region' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
1 year ago
taha.alam
c2f38f1b7f
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6_search_hospital_by_region
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
# android/app/src/main/res/values/strings.xml
1 year ago
sultan khan
2ab0d0b682
WD:get current location place change and live care ui changes
1 year ago
taha.alam
0221cb1250
WD: search by region added for the doctors to be mapped.
1 year ago
haroon amjad
d98f2c31a2
updates
1 year ago
taha.alam
7cafe3aaa9
WD: Arabic name value is handled.
1 year ago
taha.alam
11b83d1276
WD: Grouped by region ui changed and added to other two tabs of Search
1 year ago
haroon amjad
c77ffb1730
updates
1 year ago
taha.alam
fa87e74b02
WD: Border Added for the directional for multilingual
1 year ago
taha.alam
4c4ae6caef
WD: Translation of words added and download button added
1 year ago
haroon amjad
780f645cbe
Updates & fixes, CR 6038 Ask Dr changes implemented
1 year ago
taha.alam
3d27fbdea8
WD: lab report changes
1 year ago
Haroon Amjad
a31c677919
invoice type check added
1 year ago
haroon amjad
95a4d8dd14
PaymentRequestID added in InPatient Advance Insert API
1 year ago
haroon amjad
880611f7bb
Insurance card details button removed, Autofill for WhatsApp for android implemented, Updated to stores VersionID 17.3
1 year ago
haroon amjad
e9accb00ef
updates
1 year ago
haroon amjad
62bc29d450
updates
1 year ago
taha.alam
bd3dca6719
WD: session id issue fixed
1 year ago
taha.alam
59335ac04d
WD: reverting changes
1 year ago
taha.alam
8509c3d94d
WD: picking otp and providing the code to flutter channel
1 year ago
taha.alam
c4de4c1bd9
Merge branch 'dev_v3.13.6' of http://34.17.52.180/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/uitl/whatsapp_method_channel.dart
1 year ago
haroon amjad
b677be9e3c
Updates & fixes
1 year ago
taha.alam
ff7afe5997
WD: vital sign camera screen added
1 year ago
taha.alam
4bfaf0a0d8
WD: vital sign camera screen added
1 year ago
taha.alam
21b2fae806
WD: vital sign changes
1 year ago
taha.alam
f52aed49fd
WD: gradle changes
1 year ago
taha.alam
c6787ff966
WD: doctor list by region and sorting by name and distance
1 year ago
taha.alam
615f3bfa8e
WD: region filter is added.
1 year ago
taha.alam
cd460ee31b
WIP: doctor list by region
1 year ago
haroon amjad
229efb2e25
Medical report In-App view & share enabled & update sent to stores VersionID 17.2
1 year ago
haroon amjad
c72892b1a6
SMS Auto OTP Verify enabled & build sent to stores, VersionID 17.1
1 year ago
haroon amjad
32cf61d1bf
Download & Share options added for Ready Medical Report.
1 year ago
haroon amjad
b5eaedb721
Update to stores VersionID 17.1, CR 5047 & CR 7241.
1 year ago
haroon amjad
3f22d69058
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
...
# Conflicts:
# lib/config/config.dart
# lib/main.dart
# lib/splashPage.dart
# lib/uitl/CalendarUtils.dart
# lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad
0e73d6d23e
updates
1 year ago
haroon amjad
e0de0768b6
CR 7241 changes, ProjectID added in radiology results if navigating from appointment details
1 year ago
haroon amjad
ab33d06b91
Fix for VIDA4 Lab Special Result
1 year ago
haroon amjad
6f0f422adf
CheckIn button removed as per Mr Rwaid's instructions.
1 year ago
haroon amjad
65d7f3f9b9
Font family fixes
1 year ago
haroon amjad
d474eb9a24
Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0
1 year ago
haroon amjad
9909cfaa57
QRCode & Location checkin implemented in ER Online Check-In
1 year ago
haroon amjad
291cf16d22
Changes for Laser clinic full body part
1 year ago
haroon amjad
baa7790b89
Patient occupation selection implemented
1 year ago
haroon amjad
545cfcd6d9
updates
1 year ago
haroon amjad
924c111771
Lab result widget fixes
1 year ago
haroon amjad
cfcba179c4
CR 7241 Lab result enhancement code merged
1 year ago
haroon amjad
b80e171d25
Merge branch 'dev_3.3_LabReportEnhancementCR' into dev_3.13.6_Development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/model/labs/patient_lab_orders.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/charts/show_chart.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/my_rich_text.dart
1 year ago
haroon amjad
1561a776e3
Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
...
# Conflicts:
# lib/config/config.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInBookAppointment.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart
# lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/clinic_services/get_clinic_service.dart
1 year ago
haroon amjad
cd7da0dd70
Penguin SDK changes & crashlytics
1 year ago
haroon amjad
21403a2bba
InPatient Help PRO error handling issue resolved
1 year ago
haroon amjad
849164be2c
Laser appointment booking changes
1 year ago
haroon amjad
931e748a54
updates
1 year ago
haroon amjad
dff03796e9
Crashlytics enabled
1 year ago
haroon amjad
c58cbae99c
InPatient prescription send email issue fixed
1 year ago
haroon amjad
1cadee754e
CR Implemented
1 year ago
haroon amjad
20bfdc3652
Project Name Top & Bottom changes implemented
1 year ago
haroon amjad
091f3b0830
CRs 5656, 5801 & 6265 (InPatient CRs & ER Online Check-In) update to stores with versionID 16.8
1 year ago
Aamir
3d2e0a5442
cr 7211 lab report new ui changes
1 year ago
Aamir
b74a433798
cr 7211 lab report new ui changes
1 year ago
haroon amjad
8e46738982
bug fixes
1 year ago
haroon amjad
0bdfa9157b
updates
1 year ago
haroon amjad
41b0e65e41
iOS Calendar fix
1 year ago
Aamir
0f0b541563
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
1 year ago
haroon amjad
068b6c8494
calendar events updates
1 year ago
haroon amjad
f58e07d789
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR5047_LiveCare_Enhancements
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/conference/zoom/call_screen.dart
# lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad
7188919172
Updates & fixes
1 year ago
haroon amjad
82de56266e
InPatient Services issues fixed
1 year ago
haroon amjad
d9b4b1575d
Merge branch 'dev_3.13.6_merge_ER_Online_CheckIn' into dev_v3.13.6
1 year ago
haroon amjad
2997f49a95
updates
1 year ago
haroon amjad
6386da8936
Mapbox key updated to custom maps
1 year ago
haroon amjad
9d444ccca3
updates
1 year ago
haroon amjad
71542e9db6
Inpatient module code merged & code fixes
1 year ago
haroon amjad
6a555ace41
ER Online CheckIn & InPatient CR implemented
1 year ago
haroon amjad
42dbe066fd
Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_merge_ER_Online_CheckIn
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad
18b4fc5317
Patient app update
1 year ago
haroon amjad
14a5fec61a
updates
1 year ago
Aamir
45bc6a91a4
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
...
# Conflicts:
# android/app/build.gradle
1 year ago
haroon amjad
3d44aa2e64
Sickleave updates
1 year ago
haroon amjad
3071a20b8a
VIDA 4 package booking update
1 year ago
haroon amjad
c6ee01c652
Waiting appointment bug fix
1 year ago
haroon amjad
605f02afe2
Sickleave CR updates & changes
1 year ago
haroon amjad
073cb9f7e8
Update to stores 16.5:
...
1. Indoor navigation
2. Walkin Appointment
3. Derma Package
4. NPHIES Eligibility
1 year ago
haroon amjad
cee903dd6b
changes for the hospital gesture clicked area and nearest check not showing the hospital dropdown area
1 year ago
haroon amjad
7ddd932c51
no message
1 year ago
Aamir
da3e266989
local
1 year ago
taha.alam
34ffec93fd
WD: calender issue fixed.
1 year ago
haroon amjad
a6ee6869cc
Merge commit '81b94814ce4f0a1e4626fe07a9b7933246d71336' into dev_v3.13.6
1 year ago
taha.alam
81b94814ce
WD: hospital top and bottom name added
1 year ago
Haroon Amjad
ecd4422905
updates & fixes
1 year ago
Haroon Amjad
fb13096f94
NPHIES Eligibility check implemented in LiveCare Schedule Appointment booking in ToDo list
1 year ago
Haroon Amjad
05abea2d53
NPHIES Eligibility check implemented in LiveCare Schedule Appointment booking
1 year ago
taha.alam
fe9d259cbd
build context handled
1 year ago
Haroon Amjad
b042292f9a
code merged
1 year ago
Haroon Amjad
69493934b1
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/QRCode.dart
1 year ago
Haroon Amjad
057994dfd2
Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/viewModels/project_view_model.dart
# lib/uitl/translations_delegate_base.dart
1 year ago
taha.alam
936682ff95
WD: clinic by hospital
1 year ago
Haroon Amjad
cf72ffe9ce
Merge branch 'dev_v3.13.6' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# pubspec.yaml
1 year ago
haroon amjad
8cc1e08421
icons for indoor navigation updated
1 year ago
haroon amjad
8862cc6c06
Release issues resolved
1 year ago
haroon amjad
1e98539537
Code merged for PenguinIn Indoor navigation into main branch
1 year ago
haroon amjad
fd70387b2d
Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
...
# Conflicts:
# pubspec.yaml
1 year ago
haroon amjad
ef36e8bd30
fixes
1 year ago
haroon amjad
06c0580d84
updates
1 year ago
haroon amjad
03e5604f68
updates
1 year ago
haroon amjad
e4d0b93c9f
Implemented NPHIES check in WalkIn Appointment
1 year ago
Haroon Amjad
7b4a98bbb9
updates
1 year ago
taha.alam
f80892b630
WD: header added to location list
1 year ago
taha.alam
633059b0be
WD: Location dialog is added.
1 year ago
haroon amjad
b64cf0bf6c
SFCalendar issue fixed & update to stores 16.4
2 years ago
haroon amjad
faeba6a14c
CloudFlare & NPHIES in livecare reinstated
2 years ago
taha.alam
e14dc10c1c
WD: permission updated for android version 31 and later
2 years ago
haroon amjad
92ccbaa2b5
updates
2 years ago
Haroon Amjad
49c11537b3
updated to latest flutter 3.24
2 years ago
haroon amjad
db91921de1
update to stores version 16.3
2 years ago
taha.alam
88940d2c54
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
2 years ago
taha.alam
c6e74e73d0
WD: icon updated
2 years ago
Aamir.Muhammad
3aaaf3c01c
Merge branch 'refs/heads/dev_v3.13.6_PenguinIn_3.24-IOS' into dev_v3.13.6_PenguinIn
2 years ago
Aamir.Muhammad
5883b06fcb
Updated to 3.24 Flutter & Penguin Fixed.
2 years ago
Aamir.Muhammad
e045c375d2
Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
2 years ago
taha.alam
2b293d3c96
WD: penguin library updated.
2 years ago
haroon amjad
f42223292a
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
...
# Conflicts:
# lib/config/config.dart
2 years ago
haroon amjad
6c98f9f94f
updates & fixes
2 years ago
haroon amjad
536c95c825
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad
b6ba9fff2f
Updates n fixes
2 years ago
haroon amjad
dc17576c26
Flutter version upgraded to 3.22.0
2 years ago
haroon amjad
6f0cfebc89
Translation updates as requested by QA
2 years ago
haroon amjad
21c29e6355
LiveCare NPHIES eligibility check implemented
2 years ago
haroon amjad
b6adfb2534
ER Online Check-In CR implemented
2 years ago
Haroon Amjad
1c66351011
Updates & fixes
2 years ago
Haroon Amjad
e193568aaf
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
2 years ago
taha.alam
771b20f21c
WD: clinic_id converted to clinicID.
2 years ago
Haroon Amjad
60a35032e5
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
2 years ago
Aamir.Muhammad
145cd6010a
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
2 years ago
Aamir.Muhammad
7065b00c5c
Penguin Map Integration & Permissions Fixes.
2 years ago
Haroon Amjad
e27594d017
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
...
# Conflicts:
# android/app/build.gradle
# lib/services/payfort_services/payfort_service.dart
2 years ago
Haroon Amjad
72d459ce10
PenguinIn updates
2 years ago
taha.alam
ae7fbbfb98
WD: penguin view navigation to clinic id added and username modified.
2 years ago
Aamir.Muhammad
94c3992c8d
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
...
# Conflicts:
# android/app/build.gradle
2 years ago
haroon amjad
f83d538472
fixes
2 years ago
taha.alam
7ca806571f
WD: base url replaced with data url
2 years ago
Aamir.Muhammad
787a3d8662
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
2 years ago
taha.alam
1ee19ac696
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
2 years ago
taha.alam
e996653253
WD:penguin new sdk
2 years ago
Haroon Amjad
05d0d2d5a7
PenguinIn Params updated
2 years ago
Haroon Amjad
6efb316377
homepage updates
2 years ago
haroon amjad
2d82b97680
updates
2 years ago
Aamir.Muhammad
29830f4f55
Merge remote-tracking branch 'origin/dev_v3.13.6_PenguinIn' into dev_v3.13.6_PenguinIn
...
# Conflicts:
# ios/Runner/Helper/HMGPenguinInPlatformBridge.swift
# ios/Runner/Penguin/PenguinView.swift
2 years ago
Aamir.Muhammad
cba8369a51
Penguin Map Integration & Permissions Fixes.
2 years ago
haroon amjad
a5d68bf470
update
2 years ago
Haroon Amjad
87c7dcb68a
Merge branch 'dev_v3.13.6_PenguinIn' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6_PenguinIn
2 years ago
Haroon Amjad
029f174a6c
Penguin scenarios implemented
2 years ago
taha.alam
96b7fea5c9
WD:payfort services changes reverted
2 years ago
taha.alam
1e8953538a
WD: notification for navigation added
2 years ago
haroon amjad
147fb6cee8
updates
2 years ago
haroon amjad
76545bd152
updates
2 years ago
haroon amjad
393ea45d2c
updates
2 years ago
haroon amjad
6d2484e6ac
ClinicID fix
2 years ago
haroon amjad
f714d17686
fixes
2 years ago
haroon amjad
f8d797f80a
updates
2 years ago
haroon amjad
98389e3f68
LiveCare Call Type implemented
2 years ago
haroon amjad
9f629afb9c
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/app_shared_preferences.dart
2 years ago
haroon amjad
f36fc4d88d
ListView accordion fixes
2 years ago
haroon amjad
d3d8d1f121
Update to stores 16.0
2 years ago
haroon amjad
50ba0372db
language updates
2 years ago
haroon amjad
34778d91d7
language fixes
2 years ago
haroon amjad
baaacdb2f8
updates
2 years ago
haroon amjad
0eb0a94f48
updates
2 years ago
haroon amjad
cab1854cce
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
2 years ago
haroon amjad
a39d2840e0
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
2 years ago
haroon amjad
66ec7b5ca4
Derma package appointment booking fixes
2 years ago
haroon amjad
ed037edf22
Apple Pay fixes
2 years ago
haroon amjad
8838eb4769
Dr speciality translation fix
2 years ago
haroon amjad
5e8fe20f52
updates
2 years ago
haroon amjad
b1432280a1
updates
2 years ago
Aamir.Muhammad
fb4cf08b89
Penguin Map Integration & Permissions Fixes.
2 years ago
haroon amjad
11a43eb0ae
updates
2 years ago
haroon amjad
53015422e5
PenguinIn integration with HMG App
2 years ago
haroon amjad
43741e24cf
fixes
2 years ago
haroon amjad
0eaeb75207
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
2 years ago
haroon amjad
82e933a06f
updates & fixes for walkin appointment CR
2 years ago
Aamir.Muhammad
4c5ba6048f
CR Fixes Search By Clinic & Search By Doctor List Reload Issue
2 years ago
haroon amjad
1b545c4d0b
Walkin appointment booking implemented in Appointment Details page
2 years ago
haroon amjad
ca8533190a
Walkin appointment booking implementation contd
2 years ago
haroon amjad
adf00e101f
Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
2 years ago
haroon amjad
31aa09e35b
translation fix
2 years ago
haroon amjad
d65325f998
Payment flow integration for Walk-In appointments
2 years ago
Sultan khan
554548bc9a
CR updates
2 years ago
Sultan khan
9501c2ea9a
derma CR 6804 CHANGES and language on initial load issue fix.
2 years ago
haroon amjad
984459d314
Walkin appointment implementation contd
2 years ago
haroon amjad
b3f2904e9a
Waiting appointment implementation contd.
2 years ago
haroon amjad
1094d297f4
Update to stores 15.9
2 years ago
haroon amjad
52e63fe5e4
Update to stores 15.9
2 years ago
haroon amjad
d0e743dcc9
Family members issue fixed in android
2 years ago
haroon amjad
f6b89e1ae6
ER Online Check-In fixes
2 years ago
haroon amjad
752d5e5944
Appointment timeline fix
2 years ago
haroon amjad
4dc0a3f6c2
ER Online Check-In changes
2 years ago
haroon amjad
84159656b6
updates for ER Online-Checkin
2 years ago
haroon amjad
8a319cc2f2
updates & fixes
2 years ago
haroon amjad
8f9882fc5c
Updates
2 years ago
haroon amjad
88d79367ba
updates & fixes
2 years ago
haroon amjad
de5317ae55
Merge branch 'dev_3.3_ER_Online_CheckIn' into dev_3.13.6_Development
...
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
2 years ago
haroon amjad
8edf65daf1
Updates & Fixes
2 years ago
haroon amjad
c948a1780c
Update to stores VersionID 15.8
2 years ago
Aamir.Muhammad
be4022cee5
Calender Event Fixes Function Changes
2 years ago
haroon amjad
e9404f1656
Prescription reminder fixes
2 years ago
haroon amjad
2b560840aa
lab special result fix
2 years ago
Aamir.Muhammad
02878b7df9
Calender Event Fixes
2 years ago
Aamir.Muhammad
0ef716f536
Calender Event Fixes
2 years ago
Aamir.Muhammad
2e25940b62
Calender Event Fixes
2 years ago
Aamir.Muhammad
515896c265
Calender Event Fixes
2 years ago
Aamir.Muhammad
76f5fc2ef8
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
2 years ago
Aamir.Muhammad
69ed32917f
Null fixes after merge from 3.13
2 years ago
haroon amjad
5b7b40c732
Updates & fixes
2 years ago
haroon amjad
6c9ab32d98
Native changes
2 years ago
haroon amjad
c97fd25cdd
Zoom integration updates & other stability fixes
2 years ago
Aamir.Muhammad
e962469c7e
Null fixes after merge from 3.13
2 years ago
Aamir.Muhammad
d9cf383648
Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/reports/report_home_page.dart
2 years ago
haroon amjad
9a0a658083
Online CheckIn CR implementation Contd.
2 years ago
haroon amjad
3a64858905
Invalid NFC Scan check added
2 years ago
haroon amjad
f65fe26fd2
ER Online CheckIn implementation contd
2 years ago
haroon amjad
3a65113149
Update to stores 15.7
2 years ago
haroon amjad
f5df1b1d01
ER Online CheckIn implementation Contd
2 years ago
haroon amjad
704d691816
ER Online Check-In contd.
2 years ago
Sultan khan
51bbc42ca9
security patch for 3 attempt fixed.
2 years ago
Sultan khan
21e4bb5138
error code 699 fixes
2 years ago
haroon amjad
9c957741b4
medical report fix
2 years ago
Aamir.Muhammad
011f5b1f57
Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
2 years ago
Haroon Amjad
eefdb1fa3e
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Haroon Amjad
582f1f1566
updates
2 years ago
Aamir.Muhammad
29c2fd067e
Null fixes after merge from 3.13
2 years ago
Aamir.Muhammad
8441a0ef00
Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
...
# Conflicts:
# lib/pages/login/login.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/services/clinic_services/get_clinic_service.dart
# lib/uitl/utils.dart
# lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
Aamir.Muhammad
0588e68c67
local Auth fix
2 years ago
haroon amjad
672d0b7e8c
InPatient medical report enabled
2 years ago
haroon amjad
9a102be7c7
PatientID QR image added
2 years ago
haroon amjad
96d5c3ce1d
My Instructions added
2 years ago
haroon amjad
5f90435442
National ID input validation added
2 years ago
haroon amjad
6e30df2a29
WeCare service added
2 years ago
haroon amjad
4c0d758dd1
Zoom updates
2 years ago
haroon amjad
9ab10eebce
Zoom Video SDK integrated
2 years ago
Sultan khan
d1b13d5ce9
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
haroon amjad
a4a638aa37
updates
2 years ago
Sultan khan
c9be715436
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/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/blood_donation.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad
69e64fd5fb
Blood Donation CR merged into dev_3.3
2 years ago
haroon amjad
f8e7ccf73f
updates
2 years ago
haroon amjad
7b181192f6
Apple Pay updates
2 years ago
Aamir Muhammad
e18ba6822a
changes local
2 years ago
Aamir Muhammad
660ec3a207
changes local
2 years ago
Aamir Muhammad
52a5e978a7
changes local
2 years ago
haroon amjad
3dffb26aee
updates
2 years ago
Sultan khan
5e9d08b9aa
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/config/config.dart
2 years ago
Sultan khan
08b4c8f86e
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/landing/landing_page.dart
# lib/pages/livecare/widgets/LiveCareHistoryCard.dart
# lib/pages/medical/eye/ContactLensPage.dart
# lib/pages/medical/medical_profile_page_new.dart
# lib/uitl/LocalNotification.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/widgets/Loader/gif_loader_container.dart
# lib/widgets/data_display/medical/time_line_new_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
2 years ago
haroon amjad
968e59707e
updates
2 years ago
Sultan khan
99e2edea31
lab result change for PMA-892
2 years ago
haroon amjad
2ebaed4841
label updated
2 years ago
haroon amjad
d6dacfb743
Load more added in appointments timeline.
2 years ago
haroon amjad
5256d8873f
ToDo & Appo Timeline changes
2 years ago
haroon amjad
fe37de9621
Loading dialog updates
2 years ago
Sultan khan
63f5f7890e
updates
2 years ago
Sultan khan
eee2ccf148
updates
2 years ago
haroon amjad
727a9f1363
updates & checks
2 years ago
haroon amjad
e0c9914206
Issue for appointment reschedule fixed
2 years ago
haroon amjad
7fc47ebf34
LiveCare invoice fix
2 years ago
haroon amjad
162b2fd22a
updates
2 years ago
Aamir Muhammad
64568edc01
Android build issue fixed
2 years ago
Sultan khan
d255ada2ea
eye measurements fixed
2 years ago
Aamir Muhammad
b6d222a7ea
JIRA Fixes
2 years ago
haroon amjad
b42c47f074
Update to stores
2 years ago
Sultan khan
0e04012219
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/services/clinic_services/get_clinic_service.dart
2 years ago
Sultan khan
a4ed832147
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/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/pages/ErService/OrderLogPage.dart
# lib/pages/ErService/rapid-response-team/rrt-request-page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/payfort_services/payfort_service.dart
# lib/services/payfort_services/payfort_view_model.dart
# lib/splashPage.dart
# pubspec.yaml
2 years ago
haroon amjad
e0ae8d7c8e
Updates & fixes
2 years ago
Sultan khan
d4519e1507
fixed
2 years ago
Sultan khan
001417f9b3
fixes
2 years ago
haroon amjad
357f0f8c24
updates
2 years ago
haroon amjad
a12558076f
Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
2 years ago
haroon amjad
46ad672649
Apple Pay fixes
2 years ago
Sultan khan
735582e3ab
updated code.
2 years ago
Sultan khan
6983e309e0
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# android/build.gradle
# android/gradle.properties
# ios/Runner.xcodeproj/project.pbxproj
# lib/config/config.dart
# lib/core/model/prescriptions/prescription_report_inp.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/clinic_services/get_clinic_service.dart
# pubspec.yaml
2 years ago
haroon amjad
6e558bf5a6
Splash fix
2 years ago
Sultan khan
90dc8e5e05
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/models/LiveCare/ApplePayInsertRequest.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/livecare/widgets/clinic_list.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/gif_loader_dialog_utils.dart
# lib/uitl/location_util.dart
# pubspec.yaml
2 years ago
haroon amjad
32757c85f8
updates
2 years ago
haroon amjad
180cc43705
Update to stores
2 years ago
haroon amjad
cb79d625d1
Update to stores for LiveCare fix
2 years ago
haroon amjad
30b57ff5f0
updates
2 years ago
haroon amjad
ccdf410995
Update to stores
2 years ago
haroon amjad
9043e3c687
Apple Pay Updates
2 years ago
haroon amjad
e28805f70f
updates
2 years ago
haroon amjad
b4138b2066
Show Date check added in DoctorView
2 years ago
haroon amjad
c65d668c92
updates
2 years ago
haroon amjad
3792a67ae7
updates
2 years ago
haroon amjad
7850748ea2
Dental updates
2 years ago
Sultan khan
30c14c2167
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
# lib/core/model/reports/Reports.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/medical/ask_doctor_view_model.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/PrescriptionReport.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/medical/eye/EyeHomePage.dart
# lib/pages/medical/reports/report_list_widget.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/location_util.dart
# lib/uitl/utils.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
2 years ago
haroon amjad
0168f06bb9
updates
2 years ago
haroon amjad
1b0961a08f
location timeout
2 years ago
haroon amjad
c29e2c88f0
location timeout handled in online check-in via location
2 years ago
haroon amjad
eb1bddf772
updates
2 years ago
haroon amjad
f1a74749f7
param update
2 years ago
haroon amjad
bbc42bd1e7
updates
2 years ago
haroon amjad
d3bdcfa975
Apple Pay code merged into main branch
2 years ago
haroon amjad
48202ffd12
updates
2 years ago
haroon amjad
bea15150aa
Merge branch 'development_v3.3' into dev_3.3_faiz_payfort
2 years ago
haroon amjad
ec0bed04d3
Apple Pay in production implemented & tested
2 years ago
haroon amjad
fe7c2c6873
CR 6631
2 years ago
haroon amjad
ac52ba75a7
Updates & Fixes
2 years ago
haroon amjad
98a5b7d049
my appointments fixes
2 years ago
haroon amjad
27ed5c95f2
update to stores
2 years ago
haroon amjad
e67bd54c04
updates
2 years ago
haroon amjad
b39357a497
Medical report changes, Loading added in Location Check-In
2 years ago
haroon amjad
63621b5fed
Updates & fixes
2 years ago
haroon amjad
cd8b76a374
In App Apple Pay implemented
2 years ago
haroon amjad
e1718270eb
updates
2 years ago
haroon amjad
e6d093a84c
updates
2 years ago
haroon amjad
86d3e03c06
Updates
2 years ago
haroon amjad
37aa700b2e
fixes
2 years ago
haroon amjad
e5d8505c2d
Updates & fixes
2 years ago
Sultan khan
4b28581c55
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/models/Appointments/toDoCountProviderModel.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/login/login.dart
# lib/services/authentication/auth_provider.dart
# lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad
75bfeaa716
My appointment fixes
2 years ago
haroon amjad
27b6e04d33
updates
2 years ago
haroon amjad
3401496739
Updates & fixes
2 years ago
Sultan khan
86f5e81fea
merge with 3.3
2 years ago
Sultan khan
d0c7b08eac
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/service/client/base_app_client.dart
lib/core/viewModels/er/EdOnlineViewModel.dart
lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
lib/pages/BookAppointment/DentalComplaints.dart
lib/pages/BookAppointment/components/SearchByClinic.dart
lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/landing/landing_page.dart
lib/pages/livecare/widgets/clinic_card.dart
lib/pages/login/login.dart
lib/pages/rateAppointment/rate_appointment_clinic.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/services/clinic_services/get_clinic_service.dart
lib/uitl/push-notification-handler.dart
lib/widgets/others/bottom_bar.dart
pubspec.yaml
2 years ago
haroon amjad
fddb423451
Updates & fixes
2 years ago
haroon amjad
aa04e943ef
updates & fixes
2 years ago
Sultan khan
98a2545a9b
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
...
# Conflicts:
# lib/config/config.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/uitl/push-notification-handler.dart
2 years ago
Sultan khan
c1fbce7eae
bug fixes
2 years ago
haroon amjad
cfa341aba5
Apple Pay Updates
2 years ago
haroon amjad
4ac11b2169
LanguageID Fixes
2 years ago
haroon amjad
e4ce158277
updates
2 years ago
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
52b3c196d6
updates
2 years ago
Faiz Hashmi
704c0bbbc6
Merge branch 'development_v3.3' into dev_3.3_faiz_payfort
2 years ago
Faiz Hashmi
fe665fd5ae
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
...
# Conflicts:
# pubspec.yaml
2 years ago
haroon amjad
512db615be
Language ID fixes & app update to stores, VersionID 11.5
2 years ago
Faiz Hashmi
ccb9e93d62
Added InAppApple Pay with PayFort
2 years ago
haroon amjad
2008ccf92c
updates
2 years ago
Faiz Hashmi
b769959823
Revert "changes to build app"
...
This reverts commit 1492efde
2 years ago
Faiz Hashmi
0e67851646
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
2 years ago
haroon amjad
f7dffea2eb
Language ID fixes
2 years ago
haroon amjad
724a26ca68
Updates
2 years ago
haroon amjad
a9d4cb2fd8
InApp Browser Update
2 years ago
haroon amjad
bcfeff2661
updates
2 years ago
haroon amjad
cfd8b5e8a5
Language ID Changes
2 years ago
haroon amjad
264aed70a0
NFC Check added
2 years ago
Faiz Hashmi
d3b4f37c73
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
...
# Conflicts:
# pubspec.yaml
2 years ago
haroon amjad
165f3fb9f6
NFC Check removed for appo checkin
2 years ago
haroon amjad
47779f6fa7
last appointment rating fixed
2 years ago
haroon amjad
faf3bbdd9e
Unit column position changed
2 years ago
haroon amjad
01db5408c9
fixes
2 years ago
haroon amjad
80167378d9
lat long fixes
2 years ago
haroon amjad
eef6f78fd6
Updates
2 years ago
haroon amjad
c6c4f933b2
Invoice Type param added in Labs & Rad
2 years ago
haroon amjad
0a9aee0246
updates
2 years ago
haroon amjad
421bae2037
updates
2 years ago
Sultan khan
f2a57255fc
no message
2 years ago
haroon amjad
8b468fe4b5
Updates & fixes
2 years ago
Sultan khan
6a74cdd2da
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
70077c97db
local auth change
2 years ago
Aamir Muhammad
6f99aca8a5
Inpatient Cr Merge
2 years ago
Aamir Muhammad
77651f9652
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
2 years ago
Aamir Muhammad
22b48aef92
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
haroon amjad
70176e0cb1
updates
2 years ago
Sultan khan
359a177797
updates
2 years ago
haroon amjad
beb3453ff5
updates
2 years ago
Aamir Muhammad
b450091457
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
f2079d4bbd
payment fix
2 years ago
Aamir Muhammad
0a9d3e2b4d
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
557a3baafe
theme change
2 years ago
Aamir Muhammad
881b1fba53
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Aamir Muhammad
e914925181
Calender Permission
2 years ago
haroon amjad
ded6e02663
CheckIn By Param added
2 years ago
devamirsaleemahmad
6671dea8d8
Delete Event on Calender
2 years ago
haroon amjad
a0bca92195
CR Implemented
2 years ago
Sultan khan
f534ee6f58
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/pages/BookAppointment/widgets/reminder_dialog.dart
2 years ago
Sultan khan
62dc3c162a
updated 3.13.6
2 years ago
devamirsaleemahmad
2def9f3744
Merges From 3.3
2 years ago
devamirsaleemahmad
d73cc13100
Merge branch 'development_v3.3' into dev_v3.13.6
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
2 years ago
devamirsaleemahmad
fb62ce2f19
Calender Fix Ios 17+
2 years ago
devamirsaleemahmad
1ddac14efb
Calender Permission Fix Ios 17+
2 years ago
Aamir Muhammad
a24afd4302
Calender Permission
2 years ago
Aamir Muhammad
f211fd5617
Call Notification Fix
2 years ago
haroon amjad
cb9ced27c2
updates
2 years ago
haroon amjad
1ecb8ebfe9
updated to stores version 11.3
2 years ago
Aamir Muhammad
542864c89c
Gif Loader & My Family Fixes
2 years ago
haroon amjad
f8fb336740
Location checkin privilege applied
2 years ago
Sultan khan
d459600f22
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
5cca651963
no message
2 years ago
Aamir Muhammad
75b969b265
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Aamir Muhammad
7f890bb24a
Changes
2 years ago
Sultan khan
8c46d2577d
updated with assets
2 years ago
Sultan khan
8c520d9431
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/pages/BookAppointment/widgets/DoctorView.dart
2 years ago
Sultan khan
432e64e51d
updates
2 years ago
Aamir Muhammad
b4bc99369f
Changes into Rating Bar
2 years ago
haroon amjad
245716119e
Location based Check In implemented
2 years ago
haroon amjad
6dd5fda997
Location check in implementing
2 years ago
haroon amjad
5c8bb241b3
Next Actions handled when navigating from My Appointments to ToDo list
2 years ago
devamirsaleemahmad
8bdcfcb764
Changes & Latest Merges 3.3
2 years ago
devamirsaleemahmad
0e8c1a8b2f
Merge branch 'development_v3.3' into dev_v3.13.6
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/ToDoList/widgets/paymentDialog.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# pubspec.yaml
2 years ago
devamirsaleemahmad
9d1b153739
Dropdown Changed
2 years ago
haroon amjad
b579e494c1
updates
2 years ago
Sultan khan
413535ef0b
null safety fixed.
2 years ago
Sultan khan
649521c31f
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
c96c151f44
null safety issue fixed.
2 years ago
devamirsaleemahmad
d6f51f6c82
changes
2 years ago
haroon amjad
7d2744d29c
Lab report CR implemented
2 years ago
haroon amjad
7f753014df
Inpatient advance payment projectID param issue resolved
2 years ago
haroon amjad
47ccf68b3a
updates
2 years ago
haroon amjad
7c426b90e5
updates
2 years ago
haroon amjad
a6a541b903
Lab Orders CR implementation contd.
2 years ago
Sultan khan
1a5687a27c
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/uitl/app_toast.dart
2 years ago
Sultan khan
ec13edc28b
updates.
2 years ago
devamirsaleemahmad
8f591654a5
changes
2 years ago
haroon amjad
b10383c3ff
Translation updates
2 years ago
haroon amjad
dd0099236d
Insurance dialog added post registration
2 years ago
haroon amjad
1997dbe128
updates
2 years ago
haroon amjad
c7ee76d816
updates
2 years ago
haroon amjad
e4492cbc1f
Medical instructions updates
2 years ago
haroon amjad
cb2bacf539
Update insurance for cash patient in ToDo List
2 years ago
haroon amjad
4fcc698f50
CR 6654 done
2 years ago
haroon amjad
bbee4dba66
CR 6654 cancel manual insurance update CR done.
2 years ago
devamirsaleemahmad
cbc38940ea
changes
2 years ago
devamirsaleemahmad
ed748a626b
changes
2 years ago
devamirsaleemahmad
23b7d85911
changes
2 years ago
haroon amjad
81de6f9848
updated app to stores Version ID 11.0
2 years ago
devamirsaleemahmad
4231c85055
Merge branch 'development_v3.3' 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/privilege/VidaPlusProjectListModel.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.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/service/privilege_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/core/viewModels/project_view_model.dart
# lib/models/anicllary-orders/ancillary_order_list_model.dart
# lib/models/anicllary-orders/ancillary_orders_proc_list.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/confirm_payment_page.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/insurance/insurance_update_screen.dart
# lib/pages/login/login.dart
# lib/pages/medical/ask_doctor/doctor_response.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/pages/medical/balance/my_balance_page.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/pages/medical/radiology/radiology_home_page.dart
# lib/pages/paymentService/payment_service.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# pubspec.yaml
2 years ago
haroon amjad
d5dd8757e9
Privileges added for QR & NFC CheckIn options
2 years ago
haroon amjad
772992e3ff
updates
2 years ago
devamirsaleemahmad
3f1ba19c64
changes & Null to Dynamic
2 years ago
haroon amjad
41cd55e02b
paymentRequestID added in the request
2 years ago
haroon amjad
13b2db47b5
HMC color change applied in my appointments
2 years ago
haroon amjad
6bd6572e7e
Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus.
2 years ago
haroon amjad
ee5fb615db
updates & fixes
2 years ago
haroon amjad
185f54d26d
updates & fixes
2 years ago
haroon amjad
0a478e077a
QR Code checkin implemented
2 years ago
haroon amjad
542501f5c5
updates
2 years ago
haroon amjad
a5e0de08ce
updates for ancillary
2 years ago
devamirsaleemahmad
8544b3ce3d
changes & Deletion
2 years ago
devamirsaleemahmad
720c0ac6e9
changes & Deletion
2 years ago
haroon amjad
55f1e4166e
updates
2 years ago
Sultan khan
4d52f639aa
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/pages/livecare/live_care_payment_page.dart
# lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
# lib/pages/medical/vital_sign/vital_sign_details_screen.dart
# lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
# lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
# lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
2 years ago
Sultan khan
0c534cffae
code update in progress
2 years ago
devamirsaleemahmad
2c9e51aef0
changes
2 years ago
devamirsaleemahmad
1c34843bc5
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
2 years ago
Sultan khan
6a8de14d5d
code update in progress
2 years ago
devamirsaleemahmad
519f396e76
changes
2 years ago
Sultan khan
40656a65d8
update in progress
2 years ago
devamirsaleemahmad
49d3df8c87
changes
2 years ago
devamirsaleemahmad
47801ecb36
changes
2 years ago
devamirsaleemahmad
d8836d5e89
Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
...
# Conflicts:
# lib/main.dart
# lib/uitl/CalendarUtils.dart
# lib/uitl/app_shared_preferences.dart
2 years ago
devamirsaleemahmad
c1fd6313b1
changes
2 years ago
Sultan khan
c63a1fadf5
code updated in-progress
2 years ago
Sultan khan
6a6ac76973
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
Sultan khan
8a42bf8b2f
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
...
# Conflicts:
# lib/widgets/buttons/custom_text_button.dart
2 years ago
devamirsaleemahmad
dfc6e86442
models updates -> 3.13.6
2 years ago
Sultan khan
aa605a2e47
file updated
2 years ago
devamirsaleemahmad
1c19b36d2d
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
b26f535749
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
9c2948db29
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
50816d452e
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
2 years ago
devamirsaleemahmad
b3587688b8
models updates -> 3.13.6
2 years ago
Sultan khan
391331f508
code update in progress
2 years ago
devamirsaleemahmad
971bab465c
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
03d550936e
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
cb56750e6b
models updates -> 3.13.6
2 years ago
Sultan khan
04244675e1
code updated.
2 years ago
Sultan khan
6f8be66f42
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
devamirsaleemahmad
511c9788da
models updates -> 3.13.6
2 years ago
devamirsaleemahmad
2a4059fd66
models updates -> 3.13.6
2 years ago
Sultan khan
1eb38b1dc4
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
2 years ago
devamirsaleemahmad
3523daa9fa
updates -> 3.13.6
2 years ago
Faiz Hashmi
1492efdedb
changes to build app
2 years ago
Sultan khan
f9d3602e9a
updated code
2 years ago
devamirsaleemahmad
6ff864c4cd
updates -> 3.13.6
2 years ago
Sultan khan
8bf5479f56
code updated.
2 years ago
devamirsaleemahmad
e8e7a726f5
updates -> 3.13.6
2 years ago
Sultan khan
b45cbbcf29
updates
2 years ago
haroon amjad
7c804f77fb
updates & fixes
2 years ago
haroon amjad
dac842f50c
fixes for inpatient advance
2 years ago
haroon amjad
d11b12ac9a
no message
2 years ago
haroon amjad
c5e88ac7ba
fixes
2 years ago
haroon amjad
645e266af8
Vida plus updates sent to stores
2 years ago
haroon amjad
f0a4bd6925
Commented the CRs code
2 years ago
haroon amjad
3f6c05825d
updates
3 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
3 years ago
haroon amjad
0f4f98f31c
fixes
3 years ago
haroon amjad
af5b0766a2
CR 6654, Disable update manual insurance temporarily.
3 years ago
haroon amjad
b2f390c19d
CR 6204 implemented
3 years ago
haroon amjad
14928ad833
CR 6204
3 years ago
haroon amjad
34d3cf2945
CR 6204 Lab reports enhancements in progress
3 years ago
haroon amjad
f2bf57f8cc
updates
3 years ago
haroon amjad
df610690d5
updates
3 years ago
haroon amjad
e780df90e1
updates
3 years ago
haroon amjad
d8e9f36844
updates
3 years ago
haroon amjad
c0595a8dc6
updates
3 years ago
Sultan khan
abcf82346e
Excluded change
3 years ago
haroon amjad
31144c7c27
updates
3 years ago
haroon amjad
2048747a62
ancillary updates
3 years ago
haroon amjad
9ed454f67a
Cash patient check implemented
3 years ago
haroon amjad
49963911ba
Patient eligibility change
3 years ago
haroon amjad
4dd16bde59
Inpatient medical report fixes
3 years ago
haroon amjad
a58e4452b8
ancillary changes
3 years ago
haroon amjad
38661621e3
updates & fixes
3 years ago
haroon amjad
6f20f1b871
InPatient Discharge Medications
3 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
3 years ago
haroon amjad
275c99a4ce
updates
3 years ago
haroon amjad
0f863cd259
Updates & fixes
3 years ago
haroon amjad
652c19cdf8
updates
3 years ago
haroon amjad
5ddf8d4b7a
View Dr response fix
3 years ago
haroon amjad
66600fe66c
Medical report CR implemented
3 years ago
haroon amjad
fb9a4d5297
Laser clinic changes
3 years ago
haroon amjad
6b121e7f39
Store build version 4.5.026
3 years ago
haroon amjad
75685b1f61
Project selection added in Laser & advance payment
3 years ago
haroon amjad
e64a91855f
fixes
3 years ago
haroon amjad
7702960bb5
InPatient medical report & view medical report commented out
3 years ago
haroon amjad
3642ca6a47
InPatient advance payment updates
3 years ago
haroon amjad
1300dadce1
Inpatient advance payment
3 years ago
haroon amjad
4a7ca9cd46
InPatient advance payment history implemented
3 years ago
haroon amjad
5c5ed35df8
Clinic & Doctor ID added
3 years ago
haroon amjad
2bf8d454f5
updates
3 years ago
haroon amjad
c58e180c91
Updates
3 years ago
haroon amjad
965df33253
Appointment actions fixes
3 years ago
haroon amjad
7c68779324
Nphies integration
3 years ago
haroon amjad
3e63d80655
Ancillary order updates
3 years ago
haroon amjad
ae0fca865d
InPatient Advance payment API implemented
3 years ago
haroon amjad
a9ae44ca89
Implemented checks for InPatient CR
3 years ago
haroon amjad
2455f48fe1
View medical report done
3 years ago
haroon amjad
dd79b1dfca
InPatient pending advance payment done
3 years ago
haroon amjad
4afdf5545e
Translations added
3 years ago
haroon amjad
d251ca0e1c
Inpatient medical instructions implemented
3 years ago
haroon amjad
786dd76f57
updates
3 years ago
haroon amjad
e4e3377c5c
update
3 years ago
haroon amjad
3353c93de9
fixes
3 years ago
haroon amjad
44d8f0efe2
InPatient medical report contd.
3 years ago
haroon amjad
da0a164b0e
updates
3 years ago
haroon amjad
a17b941c63
InPatient Medical Report continued
3 years ago
haroon amjad
9b3c07d3b1
Added AED in advance payment
3 years ago
haroon amjad
657248803f
Ask doc disabled for LiveCare appointments
3 years ago
haroon amjad
d261557cd7
Admitted patient API changed
3 years ago
haroon amjad
ff23f3a8cb
fixes
3 years ago
haroon amjad
b2ec6c76bf
ancillary fix
3 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
3 years ago
haroon amjad
b92e45aa93
Updates & fixes
3 years ago
haroon amjad
a60f66a069
Updates
3 years ago
haroon amjad
3fb8876c31
Manual Insurance Card Update
3 years ago
haroon amjad
fe606b7823
InPatient Advance Payment
3 years ago
haroon amjad
1eccaf0aac
Regex added to allow characters only.
3 years ago
haroon amjad
1a45dd57e9
LiveCare Fix
3 years ago
haroon amjad
047877fb08
Add Doctor response rate comments validation
3 years ago
haroon amjad
20572f463a
meal plan dev completed
3 years ago
Sultan khan
5d6b50a1da
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
3 years ago
Sultan khan
83859e05f1
family file approve reject button refresh
3 years ago
haroon amjad
0e054429ef
Meal Plan implementation completed
3 years ago
haroon amjad
d9404d3abe
Medical Report changes
3 years ago
haroon amjad
bc27121c4e
meal plan updates
3 years ago
haroon amjad
96f948a8c8
updates
3 years ago
haroon amjad
4b0a41d7d8
updates
3 years ago
haroon amjad
94296cec0d
meal plan continued
3 years ago
haroon amjad
38648df897
Meal Plan development continued
3 years ago
haroon amjad
d073eb9d5f
MealPlan implementation continued
3 years ago
haroon amjad
77ab9373f8
Meal Plan APIs implementation continued
3 years ago
haroon amjad
b337343df3
Project ID fix in ancillary orders
3 years ago
Sultan khan
27373b6972
doctor header.
3 years ago
Sultan khan
5e4ca336c2
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
3 years ago
Sultan khan
68f39d965c
Merge branch 'sultan_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
...
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
# pubspec.yaml
3 years ago
haroon amjad
710e6274db
mealplan updates
3 years ago
Sultan khan
0306c777ed
rating bug fixed
3 years ago
haroon amjad
31d8443f87
insert call info updates
3 years ago
haroon amjad
f2ab76eb24
updates
3 years ago
haroon amjad
9f44b25353
Meal Plan API integration in progress
3 years ago
haroon amjad
7bc105c6c7
updates
3 years ago
haroon amjad
12af8bb8a9
updates
3 years ago
haroon amjad
6877244d0e
CR# 5805 Ask Doc Improvements dev completed.
3 years ago
haroon amjad
792b3ea249
no message
3 years ago
Sultan khan
f29d33d7e7
Changes for voice command search
3 years ago
haroon amjad
e4fe4baa27
nearest appo crash fixed
3 years ago
haroon amjad
3fda1da16a
updates
3 years ago
haroon amjad
83ca5e8e4c
ask doctor date param added
3 years ago
haroon amjad
58e598843b
sickleave
3 years ago
haroon amjad
2d93b9753d
Ask doctor improvements
3 years ago
haroon amjad
f28fcbd006
AdvanceNumber_VP added
3 years ago
haroon amjad
17acae0a95
updates
3 years ago
haroon amjad
101f2dcab8
updates
3 years ago
haroon amjad
60d5ba4a9e
Birth Notification implemented
3 years ago
haroon amjad
078482c21d
updates
3 years ago
haroon amjad
cf30762eec
updates
3 years ago
haroon amjad
420aef3195
Updates
3 years ago
haroon amjad
2437d2da9c
Updates
3 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
3 years ago
haroon amjad
77f3d0a238
radiology API fixes
3 years ago
haroon amjad
e098705374
localized strings
3 years ago
haroon amjad
7280e2a1d7
Birth Notification UI Implemented
3 years ago
haroon amjad
17e7886907
VidaPlus Project changes
3 years ago
haroon amjad
a7a06f4083
Home page change
3 years ago
haroon amjad
b64ba9211e
Inpatient services in dev
3 years ago
haroon amjad
906fd5fd6a
Inpatient services in dev
3 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
3 years ago
haroon amjad
15c4f016df
update to stores for version 10.5
3 years ago
haroon amjad
3675d05911
config changes
3 years ago
Sultan khan
0514fecae2
lab report email change
3 years ago
haroon amjad
badc13d41a
sickleave CR Enabled
3 years ago
haroon amjad
555898c822
updates
3 years ago
Sultan khan
83c15196c8
VIDA PLUS CHANGE
3 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
3 years ago
haroon amjad
fcf0c589a0
Updates & fixes
3 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
e79454973c
InPatient API
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
1eed379889
Lab result flowchart fix
3 years ago
haroon amjad
62b9b3e35c
calendar permission handled in iOS
3 years ago
haroon amjad
e81a1b8bcc
iOS Firebase fix
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
52070c8f94
Updates & 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
4 years ago
haroon amjad
e03412214e
Ambulance request fixes
4 years ago
haroon amjad
106334c9cf
updates & fixes
4 years ago
haroon amjad
dfa88b7de7
Updates, fixes & release VersionID 9.1
4 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
haroon amjad
8be9d3ae6e
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
4 years ago
haroon amjad
721abb3156
Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
...
WebRTC or OpenTok
See merge request Cloud_Solution/diplomatic-quarter!605
4 years ago
haroon amjad
833818e6e3
Rad & Lab email issues fixes
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
Zohaib Iqbal Kambrani
1aabf08417
no message
4 years ago
haroon amjad
2ba744c3a6
Timezone fixes & Activate/Deactivate file changes
4 years ago
haroon amjad
b756bf8caf
Updates
4 years ago
haroon amjad
3896f02d13
Timezone Updates
4 years ago
haroon amjad
ca43849d9d
CMC Updates
4 years ago
haroon amjad
11529c65c5
updates
4 years ago
haroon amjad
4ba229c436
Updates
4 years ago
haroon amjad
b641f5b6a3
Laser Male back image added
4 years ago
haroon amjad
eb3f5b5cb5
Updates & fixes
4 years ago
Zohaib Iqbal Kambrani
e615ca1a16
no message
4 years ago
haroon amjad
8e27cfba9b
Merge branch 'zik_development_v2.5' into 'development_v2.5'
...
Analtyics at registration and liveacare payment fail
See merge request Cloud_Solution/diplomatic-quarter!604
4 years ago
haroon amjad
72654757c4
Merge branch 'development_v2.5' into 'zik_development_v2.5'
...
# Conflicts:
# lib/pages/login/confirm-login.dart
4 years ago
haroon amjad
7018696328
E-Cens sign off
4 years ago
Zohaib Iqbal Kambrani
a69e0da77d
Merge branch 'development_v2.5' into zik_development_v2.5
...
* development_v2.5:
analytics events update
4 years ago
Zohaib Iqbal Kambrani
7051b3ed63
Analtyics at registration and liveacare payment fail
4 years ago
haroon amjad
4cbccd8efb
analytics events update
4 years ago
haroon amjad
2d366bcf7b
Merge branch 'zik_development_v2.5' into 'development_v2.5'
...
Zik development v2.5
See merge request Cloud_Solution/diplomatic-quarter!603
4 years ago
Zohaib Iqbal Kambrani
29c6841888
Analytics
4 years ago
Zohaib Iqbal Kambrani
a01b8b82da
no message
4 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
4 years ago
Zohaib Iqbal Kambrani
5c32e488d0
no message
4 years ago
haroon amjad
3396b4253b
Updates & fixes
4 years ago
Zohaib Iqbal Kambrani
6cd660184a
no message
4 years ago
haroon amjad
8b7a6e7689
ED Online Check-In
4 years ago
Zohaib Iqbal Kambrani
f42e2fb652
Revert "no message"
...
This reverts commit da7884ff61 .
4 years ago
haroon amjad
bbb99667f8
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
4 years ago
haroon amjad
6403c8f831
Merge branch 'zik_development_v2.5' into 'development_v2.5'
...
Zik development v2.5
See merge request Cloud_Solution/diplomatic-quarter!602
4 years ago
haroon amjad
f9a733884d
Calendar fixes
4 years ago
haroon amjad
27c6837f25
updates & fixes
4 years ago
Zohaib Iqbal Kambrani
1c6a62776c
Analytics statements align to bottom of block
4 years ago
Zohaib Iqbal Kambrani
1523fd5ade
Analytics for login registration
4 years ago
Zohaib Iqbal Kambrani
da7884ff61
no message
4 years ago
haroon amjad
f50bfda330
updates
4 years ago
haroon amjad
d43d6c686b
Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
...
Project Filter Applied on Packages & Offers
See merge request Cloud_Solution/diplomatic-quarter!599
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
842e099953
DateTime Fixes
4 years ago
haroon amjad
a9e48e487f
HHC Fixes
4 years ago
haroon amjad
f1129cc14c
updates & fixes
4 years ago
Zohaib Iqbal Kambrani
612d9eb019
Project Filter Applied on Packages & Offers
4 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
4 years ago
haroon amjad
c3538ebdb6
Updates & fixes
4 years ago
haroon amjad
1fbbd0aed1
Merge branch 'zik_webrtc_dev_v2.5' into 'development_v2.5'
...
Offer And Packages (View Only)
See merge request Cloud_Solution/diplomatic-quarter!598
4 years ago
Zohaib Iqbal Kambrani
94a99a911e
Offer And Packages (View Only)
4 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
33329f5c8a
base app client update
4 years ago
haroon amjad
aae48f2555
Android permission dialog updates
4 years ago
haroon amjad
887303fcde
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
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
haroon amjad
54a48a4bff
Merge branch 'sikander_family_profile_switch' into 'development_v2.5'
...
Sikander family profile switch
See merge request Cloud_Solution/diplomatic-quarter!597
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
e2f3a6ab20
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
...
* development_v2.5:
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
haroon amjad
18c9a6fb91
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!595
4 years ago
Zohaib Iqbal Kambrani
40af551f59
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
...
* development_v2.5:
4 years ago
Zohaib Iqbal Kambrani
99bdd25bd3
added more analytics logs
4 years ago
haroon amjad
60a44f9a42
OpenTok fixes
4 years ago
haroon amjad
61d0d52c59
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!593
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
438dc5c88f
Merge branch 'sikander_video_call_improvements' into 'development_v2.5'
...
Sikander video call improvements
See merge request Cloud_Solution/diplomatic-quarter!592
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
haroon amjad
10bb7a8b66
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!591
4 years ago
Zohaib Iqbal Kambrani
c61de7cfdc
no message
4 years ago
Zohaib Iqbal Kambrani
0f7301d7e0
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
...
* development_v2.5:
4 years ago
Zohaib Iqbal Kambrani
23404b4495
Video call at InAppWebView
4 years ago
haroon amjad
0117de61e7
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!590
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
65ea5522f9
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!587
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
haroon amjad
9852811983
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!586
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
742d06976f
no message
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
ceeb6c1bb7
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!583
4 years ago
haroon amjad
efced34ffa
Updates
4 years ago
haroon amjad
2a22edfdd0
no message
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
haroon amjad
9674376163
Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
...
Packages and offers fixes, HMG Internet work in progress,
See merge request Cloud_Solution/diplomatic-quarter!582
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
7f34a1fe71
Merge branch 'development_v2.5' into haroon_development_2.5
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
56b640ff91
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!579
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
haroon amjad
cd797123a3
Merge branch 'fatima_v2' into 'development_v2.5'
...
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!578
4 years ago
Fatimah Alshammari
55cc5dae4f
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
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
haroon amjad
bac6774534
Merge branch 'fatima_v2' into 'development_v2.5'
...
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!576
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
1fc45e3f7c
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!577
4 years ago
haroon amjad
6d88607631
Updates & fixes
4 years ago
Fatimah Alshammari
9740f88e6b
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
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
haroon amjad
0ac937aa7d
Merge branch 'fatima_v2' into 'development_v2.5'
...
Fatima v2
See merge request Cloud_Solution/diplomatic-quarter!575
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
3fcad86ef3
Merge branch 'development_v2.5' into haroon_development_2.5
4 years ago
haroon amjad
5ae5f75b4f
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!574
4 years ago
haroon amjad
c05772c63a
pharmacy fixes
4 years ago
haroon amjad
432ed4172a
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!573
4 years ago
haroon amjad
2ebff634c4
Merge branch 'development_v2.5' into haroon_development_2.5
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
98d50a9b42
Merge branch 'development_v2.5' into haroon_development_2.5
4 years ago
haroon amjad
d624136eab
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!572
4 years ago
haroon amjad
c2b0326676
Updates & fixes
4 years ago
haroon amjad
98d9839ac2
Merge branch 'haroon_development_2.5' into 'development_v2.5'
...
Haroon development 2.5
See merge request Cloud_Solution/diplomatic-quarter!571
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
35d1d0998a
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!568
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
4a0997cf49
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!567
4 years ago
haroon amjad
e5703586ec
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!566
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
f2001e9877
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!565
4 years ago
haroon amjad
2670d0be57
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
0fb6e9897a
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!564
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
b76183040c
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!563
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
haroon amjad
a7c052cda8
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!561
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
10b96979a3
Merge branch 'development_new_design_2.0' into Fatima-New-Design
4 years ago
Fatimah Alshammari
749b89b67d
fix issue
4 years ago
haroon amjad
94aab4a737
Speech to text fix in iOS
4 years ago
haroon amjad
8e00c59746
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!560
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
323f32267b
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!559
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
haroon amjad
8afe041b2d
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!558
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
2a01ec94ca
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!552
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
haroon amjad
908bf8b634
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
...
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!549
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
haroon amjad
bbcba1fca0
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!548
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
a46677f98e
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
38aa0fac61
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
LiveCare permissions
See merge request Cloud_Solution/diplomatic-quarter!547
4 years ago
haroon amjad
fe7baeab3c
LiveCare permissions
4 years ago
haroon amjad
39190681c6
Updates
4 years ago
haroon amjad
078300168c
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!546
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
haroon amjad
d291c4ef2b
Merge branch 'login_design_sikander' into 'development_new_design_2.0'
...
video call improvements for android
See merge request Cloud_Solution/diplomatic-quarter!545
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
998614cfe7
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!541
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
haroon amjad
51915be699
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!538
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
e683fe18b8
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!537
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
haroon amjad
f52ae6b07f
Merge branch 'login_design_sikander' into 'development_new_design_2.0'
...
laser images change & offer and packages
See merge request Cloud_Solution/diplomatic-quarter!536
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
haroon amjad
13a07ea7ae
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!535
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
0bbb3e5372
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!534
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
haroon amjad
e463b4fd25
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!533
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
7f3340cace
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!532
4 years ago
haroon amjad
d0c96d245b
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
009abd0440
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!530
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
08a895732c
Merge branch 'development_new_design_2.0' into Fatima-New-Design
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
haroon amjad
91fd8f8078
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!529
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
ed65b38dd9
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!528
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
haroon amjad
a400bc965d
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!527
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
975fe6ca7b
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!525
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
haroon amjad
943f9425cb
Merge branch 'login_design_sikander' into 'development_new_design_2.0'
...
Laser & Clinic (Conflict Resolved)
See merge request Cloud_Solution/diplomatic-quarter!524
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
haroon amjad
615e39baf0
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!523
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
haroon amjad
1d5898d071
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!520
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
fb6183a48b
Merge branch 'development_new_design_2.0' into haroon-new-design
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
Fatimah Alshammari
e3adbe4199
Merge branch 'development_new_design_2.0' into Fatima-New-Design
4 years ago
haroon amjad
a7dccb76bf
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Pharmacy fixes
See merge request Cloud_Solution/diplomatic-quarter!517
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
cd37941109
Merge branch 'development_new_design_2.0' into Fatima-New-Design
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
93517788f5
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Pharmacy fixes
See merge request Cloud_Solution/diplomatic-quarter!512
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
6495e931d7
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Shopping cart fix
See merge request Cloud_Solution/diplomatic-quarter!509
4 years ago
Haroon Amjad
464ad9a3cb
Shopping cart fix
4 years ago
haroon amjad
cbc578250a
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!508
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 Ali
110672fada
Merge branch 'nov_fixes' into 'development_new_design_2.0'
...
fix calling missing APi
See merge request Cloud_Solution/diplomatic-quarter!507
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
1686c10851
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
fixes
See merge request Cloud_Solution/diplomatic-quarter!505
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
haroon amjad
f1b44e9f0b
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!500
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
62c0333dbd
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!498
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
fd3d2b588b
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!497
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
haroon amjad
740cb79df0
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!496
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
haroon amjad
9563998fc3
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Product detail page updates
See merge request Cloud_Solution/diplomatic-quarter!495
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
0c870385ee
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!494
4 years ago
haroon amjad
db7bc11893
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
90b821a37d
Offers & packages UI completed
4 years ago
haroon amjad
f7aafcda1a
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!493
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
haroon amjad
e7ec613cd4
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!492
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
464df82da0
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!491
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
eb12c8301c
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!488
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
75056478fc
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!487
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
haroon amjad
caab3339e3
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!486
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
96684d77e0
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!485
4 years ago
haroon amjad
e1e31de818
Lakum fixes
4 years ago
haroon amjad
72784f68b9
Fixes & updates
4 years ago
haroon amjad
2e6ebc2933
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!483
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
haroon amjad
e3f720e68e
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!482
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
541f5f06e7
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!481
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
52fba56bc3
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!476
4 years ago
haroon amjad
f15090c634
Merge branch 'development_new_design_2.0' into 'sultan_new_design'
...
# Conflicts:
# lib/pages/login/register.dart
4 years ago
haroon amjad
ecfbc3efab
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!477
4 years ago
haroon amjad
8c99bba17b
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
e7f5fc8434
Blood donation fixes
4 years ago
haroon amjad
be2854c906
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
...
feedback status bar
See merge request Cloud_Solution/diplomatic-quarter!475
4 years ago
Sultan Khan
64e62235c4
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
4 years ago
Sultan Khan
a471824507
register issues
4 years ago
Mirza.Shafique
fa986476ee
feedback status bar
4 years ago
haroon amjad
e82b8d4439
Lakum & other fixes
4 years ago
haroon amjad
f029aaa1c6
Fixes & code optimizations
4 years ago
Mohammad Aljammal
f9e33e7212
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
...
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Mohammad Aljammal
8a0d0282ce
Merge branch 'pharmacy_fix_bugs' into 'development'
...
pharmacy cart fixe counter
See merge request Cloud_Solution/diplomatic-quarter!470
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
Mohammad Aljammal
0d29ba70f5
Merge branch 'Oct_fixes' into 'development_new_design_2.0'
...
fix proceed button
See merge request Cloud_Solution/diplomatic-quarter!471
4 years ago
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
haroon amjad
89505510e3
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
...
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!469
4 years ago
Mirza.Shafique
f547dc105c
Merge branch 'development_new_design_2.0' into mirza_home_page
4 years ago
Mirza.Shafique
69db41364f
icon fixs
4 years ago
Fatimah Alshammari
42e74759e4
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
...
# Conflicts:
# lib/pages/search_products_page.dart
4 years ago
haroon amjad
62974b7b72
Updates & fixes
4 years ago
Fatimah Alshammari
e6378b7ada
fix issues
4 years ago
Elham Rababh
616748dc6f
fix proceed button
4 years ago
Zohaib Iqbal Kambrani
94a5cac27d
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
Zohaib Iqbal Kambrani
9d71793e88
no message
4 years ago
haroon amjad
c8e62e986c
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
LiveCare Schedule fixes
See merge request Cloud_Solution/diplomatic-quarter!466
4 years ago
haroon amjad
57ea450662
LiveCare Schedule fixes
4 years ago
Sikander Saleem
455f65a5e5
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
d2223da3c2
improvements.
4 years ago
Mirza.Shafique
f56ae8ff5b
Merge branch 'development_new_design_2.0' into mirza_home_page
4 years ago
Mirza.Shafique
6af1747f12
live care design 3.0
4 years ago
Sikander Saleem
8c27773f7f
Merge branch 'new_design_sikander' into development_new_design_2.0
4 years ago
Sikander Saleem
40c63ae53b
dialog ui changes in wallet & improvements.
4 years ago
haroon amjad
853ca033d2
LiveCare Schedule API fix
4 years ago
Mirza.Shafique
a805273049
Merge branch 'mirza_home_page' into development_new_design_2.0
4 years ago
Mirza.Shafique
4a8fc38626
live care design 2.0
4 years ago
haroon amjad
ccc08c00ae
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!465
4 years ago
haroon amjad
3a7d5e3d66
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
2a212149ed
Health converters UI done
4 years ago
haroon amjad
73822300f9
Health Calculators APIs updated
4 years ago
haroon amjad
d4ffc76733
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Health Calculators APIs updated
See merge request Cloud_Solution/diplomatic-quarter!464
4 years ago
haroon amjad
b7bf99c862
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!463
4 years ago
haroon amjad
7123ed34ab
Translation updates
4 years ago
haroon amjad
fd07d543fa
Merge branch 'development_new_design_2.0' into haroon-new-design
4 years ago
haroon amjad
cb69684bb8
SessionID update
4 years ago
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
360acd487e
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!462
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
9c1f5ab465
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!461
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
d38de8c494
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!460
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
62b29b4904
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!459
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
222635ec79
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!458
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
3b4e12a5de
Layout files
4 years ago
haroon amjad
7350745a1e
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Layout files
See merge request Cloud_Solution/diplomatic-quarter!457
4 years ago
haroon amjad
ce3d3a69cc
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!456
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
haroon amjad
6f25f79d86
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!455
4 years ago
Fatimah Alshammari
8bb3fe62c4
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
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
d6d85092ee
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!454
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
a40cd6ccd2
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!451
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
b4591f8d15
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!452
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
76fb93fe9b
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!450
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
4264c905d9
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!449
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
5df3350125
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!448
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
5b1f0c163e
In App Review
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
0eeaa5e301
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!447
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
Zohaib Iqbal Kambrani
d0986fcaf6
OpenTok SDK applied and method channels written to native
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
a4800ce7ca
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!446
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
Zohaib Iqbal Kambrani
57a3c2a04c
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
...
* development_new_design_2.0: (33 commits)
base app client changes
Translation & UI updates
FAMILY FILE
family files
localisation update
family file change
E-Refreal design
blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
Updates & fixes
all dialog changes and improvements (cont).
UI fixes & updates
family files changes
Notification page fix
Notifications UI fix
feedback status added.
Notifications UI redesigned
Blood pressure chart fix
My tracker fixes
my family
fixes
...
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
2709b177c6
Merge branch 'pharmacy_fix' into 'development'
...
add to cart fix
See merge request Cloud_Solution/diplomatic-quarter!435
4 years ago
haroon amjad
babb48b1db
base app client changes
4 years ago
haroon amjad
68642c3ba4
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!445
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
e4c8575a7f
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!443
5 years ago
Sultan Khan
18f35a22bb
FAMILY FILE
5 years ago
Sultan Khan
5a9ab457e5
family files
5 years ago
haroon amjad
6d3ead24e1
localisation update
5 years ago
Sultan Khan
a31f55aaa7
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
4780039cc7
family file change
5 years ago
Mirza.Shafique
05a6860081
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
e1b79ef5c1
E-Refreal design
5 years ago
Sikander Saleem
ecb6315f9c
blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont).
5 years ago
haroon amjad
2db050a228
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
e564cdc7e5
Updates & fixes
5 years ago
Sikander Saleem
0b4305de03
all dialog changes and improvements (cont).
5 years ago
haroon amjad
fc67d0d14d
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!442
5 years ago
haroon amjad
6511ca8dc7
UI fixes & updates
5 years ago
Sultan Khan
448a3aaa48
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
881644a22e
family files changes
5 years ago
Fatimah Alshammari
e2763a5bd5
fixed cart shopping issues
5 years ago
haroon amjad
6cd2f65ce8
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
9d30bf63d0
Notification page fix
5 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
5 years ago
haroon amjad
43c67a5a84
Notifications UI fix
5 years ago
Sikander Saleem
a026fbf940
feedback status added.
5 years ago
haroon amjad
f60684ad08
Notifications UI redesigned
5 years ago
haroon amjad
8cf6642c79
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
803f5a786b
Blood pressure chart fix
5 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
5 years ago
haroon amjad
a996f83ee1
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!440
5 years ago
haroon amjad
07a98d75c6
My tracker fixes
5 years ago
Sultan Khan
a39658206d
my family
5 years ago
haroon amjad
40cbca565a
fixes
5 years ago
haroon amjad
e1f5eb8b83
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
haroon amjad
8ea6a5de04
localization fix
5 years ago
Sultan khan
f2397246f9
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!439
5 years ago
Sultan Khan
160049973e
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
e3a7c08e7c
blood type changes
5 years ago
Sikander Saleem
54c3beadf2
improvements.
5 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
5 years ago
haroon amjad
58c78656bf
Rating dialog updates
5 years ago
Mirza.Shafique
dde16a13fe
General page in profile
5 years ago
Sikander Saleem
21863cfe06
improvements.
5 years ago
Sikander Saleem
ad98dfce67
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
5 years ago
Sikander Saleem
1223ab7a17
h20 week & month graph updated & improvements.
5 years ago
haroon amjad
32e5f43e96
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
HarHaroon new design
See merge request Cloud_Solution/diplomatic-quarter!438
5 years ago
haroon amjad
4a2e01b8b1
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
b475adb5c3
Updates & fixes
5 years ago
Zohaib Iqbal Kambrani
b1244f0bf3
Huawei MapTiles loading issue fix by apply signing on App and AGConnect
5 years ago
Sultan khan
c88399c751
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
family file fixes
See merge request Cloud_Solution/diplomatic-quarter!436
5 years ago
Sultan Khan
5c8b809e39
family file fixes
5 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
5 years ago
Fatimah Alshammari
30a1353be6
fixed brands design and recommended products issues
5 years ago
hussam al-habibeh
a8fb7152b1
add to cart fix
5 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
5 years ago
Mirza.Shafique
d664a216c6
Profile Page and Back Button Click
5 years ago
Mohammad Aljammal
0590642854
Merge branch 'cart' into 'development'
...
Cart
See merge request Cloud_Solution/diplomatic-quarter!434
5 years ago
hussam al-habibeh
66acda38a3
add to cart fix
5 years ago
Elham Rababh
75fdadafbd
refactor widget in the cart preview
5 years ago
Elham Rababh
2526d6bc6f
fix issue in cart page
5 years ago
haroon amjad
e62e3dae1b
CMC APIs coverting to RC
5 years ago
haroon amjad
6902e6529c
Merge branch 'development_new_design_2.0' into haroon-new-design
5 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
5 years ago
Sikander Saleem
f6b96dcb7b
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByDoctor.dart
5 years ago
Sultan Khan
3b4e03c618
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
b5cd6afa4b
family file fixs
5 years ago
Sikander Saleem
c9662c7451
schedule appointment navigation fix.
5 years ago
haroon amjad
0a9d0e5eaa
fixes
5 years ago
Mirza.Shafique
6261f01ab6
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
9c7e8e3637
Back Button on Landing Page 1
5 years ago
haroon amjad
6d725f807b
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!432
5 years ago
haroon amjad
3f3ddd7af0
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Mohammad Aljammal
26c83cd93d
Merge branch 'pharmacy_fix_bugs' into 'development'
...
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!430
5 years ago
Sikander Saleem
f509679173
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
haroon amjad
cbf2e84959
fixes
5 years ago
Sikander Saleem
1346eab593
h2o today page, prescription & schedule appointment improvements.
5 years ago
Sultan khan
c99e32e129
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!431
5 years ago
haroon amjad
022b1bd000
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
Sultan Khan
02f5b43b64
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
ca70926050
family file fixes
5 years ago
haroon amjad
cb220031dd
Updates & fixes
5 years ago
mosazaid
b779c250a4
pharmacy cart and wishlist fixes
5 years ago
Mirza.Shafique
d48a4ff4e3
Back Button on Landing Page
5 years ago
Mirza.Shafique
3a07d39bff
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Sultan Khan
549ddfdbb9
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
mosazaid
9a1dc3c678
pharmacy cart and wishlist fixes
5 years ago
haroon amjad
6c4afaf114
Advance payment API updates
5 years ago
Fatimah Alshammari
10f75191c6
added shopping cart to categories
5 years ago
mosazaid
c7f558b92e
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
5 years ago
haroon amjad
b37944866e
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!429
5 years ago
Mirza.Shafique
4d372bffb2
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
e788f09ed9
Show Chart Widget
5 years ago
Haroon Amjad
1fa6a4409b
Family files fixes
5 years ago
Haroon Amjad
134ccb7ee1
Merge branch 'haroon-new-design' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon-new-design
5 years ago
haroon amjad
587210ee58
UI fixes
5 years ago
haroon amjad
a819660536
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
haroon amjad
01ccd484f4
Calendar plugin changed
5 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
5 years ago
Sultan Khan
9b94fe33cf
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sikander Saleem
8aa1fbfb4a
localized_values fixed.
5 years ago
Sultan Khan
9010558dc9
family files changes
5 years ago
Sikander Saleem
08960867f7
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
2aa6ad5d6b
h20 today ui (cont.)1
5 years ago
Sikander Saleem
55df00dcd4
h20 today ui (cont.)
5 years ago
haroon amjad
7264d03818
Family Files previleges fix
5 years ago
Sikander Saleem
763c16ddd0
h2o setting ui redesigned.
5 years ago
haroon amjad
870da89aec
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
259581c4f8
updates & fixes
5 years ago
Mohammad Aljammal
29d0afdea4
Merge branch 'product_detail_page' into 'development'
...
fix bottom sheet functions
See merge request Cloud_Solution/diplomatic-quarter!424
5 years ago
Mohammad Aljammal
0e5fd1d1ec
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!425
5 years ago
Elham Rababh
be21cb352b
return recommended products
5 years ago
haroon amjad
fa929adfd9
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!427
5 years ago
haroon amjad
a7ccc73c36
updates
5 years ago
haroon amjad
96c290c3f3
Localization file updates
5 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
5 years ago
haroon amjad
2c4ff16f0c
updates & fixes
5 years ago
Sultan khan
0db34ed226
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!426
5 years ago
Sultan Khan
821a9b5ade
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
2c1d7c511e
family file changes
5 years ago
haroon amjad
230d87c473
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad
01ca8b8f84
updates & fixes
5 years ago
Mirza.Shafique
cb230db0c5
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
a9773e81e7
Bug Fixes prescription
5 years ago
Sikander Saleem
8b49eed6ae
hospital text replaced with branch
5 years ago
Fatimah Alshammari
ac63f09633
edit arabic version
5 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
5 years ago
Elham Rababh
8fac62bcb1
fix bottom sheet functions
5 years ago
Fatimah Alshammari
74929f76e5
edit home page
5 years ago
Mohammad Aljammal
bcd99555e3
Merge branch 'pharmacy_fix_bugs' into 'development'
...
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!423
5 years ago
mosazaid
988625e4f1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
5 years ago
mosazaid
c1f3d3cc1c
fixes
5 years ago
Mohammad Aljammal
ad8fd65f75
Merge branch 'product_detail_page' into 'development'
...
add count to cart
See merge request Cloud_Solution/diplomatic-quarter!422
5 years ago
Elham Rababh
944bbce1bf
add count to cart
5 years ago
Elham Rababh
bfbd04e35d
add count to cart
5 years ago
mosazaid
acdd19eeed
calling cart from pharmacy home and add provider to it
5 years ago
Mohammad Aljammal
f736ab5365
Merge branch 'fix_product_tile' into 'development'
...
Fix product tile
See merge request Cloud_Solution/diplomatic-quarter!421
5 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
5 years ago
Mohammad Aljammal
d2be206d6c
Merge branch 'product_detail_page' into 'development'
...
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!420
5 years ago
Mohammad Aljammal
eb19daa98f
fix car count
5 years ago
Elham Rababh
3dc28d318a
fix bugs on wish list
5 years ago
Fatimah Alshammari
4309952b17
fixed subCategories
5 years ago
Sikander Saleem
b4031e973e
chevron icon to arrow forward
5 years ago
Elham Rababh
b0b278a7e3
fix bugs
5 years ago
haroon amjad
503ab739ca
prescription availability design revamped
5 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
5 years ago
Elham Rababh
9254004125
fix coloring issue
5 years ago
Mohammad Aljammal
0e373059a0
Merge branch 'pharmacy_fix_bugs' into 'development'
...
Pharmacy fix bugs
See merge request Cloud_Solution/diplomatic-quarter!419
5 years ago
mosazaid
8b5e1e57c7
fix bugs pharmacy wishlist
5 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
5 years ago
mosazaid
a41980b252
fix bugs pharmacy wishlist
5 years ago
Elham Rababh
7de8c2588f
fix coloring issue
5 years ago
haroon amjad
46a572674f
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
69af6799c4
updates
5 years ago
Mirza.Shafique
3a40eb92be
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Sultan khan
51cab0928a
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!418
5 years ago
Mirza.Shafique
06c5ee269b
Bug Fixes
5 years ago
Sultan Khan
f53f2f7cab
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
1b387c2dbf
changes pushed
5 years ago
Mohammad Aljammal
00a0e34347
Merge branch 'product_detail_page' into 'development'
...
add loader and cache on images
See merge request Cloud_Solution/diplomatic-quarter!415
5 years ago
Elham Rababh
58d43f7e46
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
5 years ago
Mohammad Aljammal
e578b1e759
Merge branch 'pharmacy_fix_bugs' into 'development'
...
fix bugs pharmacy home and increase performance
See merge request Cloud_Solution/diplomatic-quarter!416
5 years ago
Elham Rababh
2981eb3236
fix public card issues
5 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
5 years ago
haroon amjad
5163c826ad
Updates & fixes
5 years ago
Sultan khan
23d11c2160
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!417
5 years ago
Sultan Khan
d514f64870
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
76e16594ba
FAMILY FILES
5 years ago
Sikander Saleem
6099738a5c
improvements
5 years ago
mosazaid
0d2d4c64c2
fix bugs pharmacy home and increase performance
5 years ago
Elham Rababh
7dfc700d26
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
5 years ago
Sikander Saleem
df31c82fd5
doctor header review on tap improvement.
5 years ago
Elham Rababh
055b888ba2
fix address
5 years ago
Elham Rababh
3b79d0ac41
return the disable colors
5 years ago
Elham Rababh
47e19c4ab5
add loader and cache on images
5 years ago
Sikander Saleem
5410b826c3
prescriptions new ui updated.
5 years ago
haroon amjad
cbb9151b62
Merge branch 'haroon-new-design' into development_new_design_2.0
5 years ago
haroon amjad
4593396f6c
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Mohammad Aljammal
48642a3c7c
Merge branch 'product_detail_page' into 'development'
...
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!414
5 years ago
Mohammad Aljammal
b175fb7ce0
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
5 years ago
Haroon Amjad
202e81f7c6
images added in pubspec
5 years ago
Haroon Amjad
19edcc210e
Rate appointment UI implemented
5 years ago
haroon amjad
89e1aa70c0
updates
5 years ago
Elham Rababh
1e1e230908
fix call service in case not login
5 years ago
Mohammad Aljammal
b539ff5851
Merge branch 'pharmacy_fix' into 'development'
...
cart fix
See merge request Cloud_Solution/diplomatic-quarter!413
5 years ago
Elham Rababh
a5751f0d70
handel un login cases
5 years ago
hussam al-habibeh
c56e4a1a5c
cart fix
5 years ago
Mohammad Aljammal
6339e30369
Merge branch 'pharmacy_fix_bugs' into 'development'
...
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!412
5 years ago
mosazaid
a9d0b7a14b
fix bugs pharmacy home
5 years ago
Elham Rababh
19cb48e133
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
5 years ago
Elham Rababh
338901d423
remove add to cart
5 years ago
Elham Rababh
7c15bca746
fix item
5 years ago
mosazaid
6acb8031d0
fix bugs pharmacy home
5 years ago
Mohammad Aljammal
76eef8625d
Merge branch 'pharmacy_fix_bugs' into 'development'
...
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!411
5 years ago
mosazaid
594b2710b3
fix bugs pharmacy home
5 years ago
haroon amjad
22c6a8ce42
no message
5 years ago
haroon amjad
85d68b0388
ereferral fixes
5 years ago
Mohammad Aljammal
1f9e7563a9
Merge branch 'product_detail_page' into 'development'
...
fix scaffold
See merge request Cloud_Solution/diplomatic-quarter!409
5 years ago
Sultan khan
d3f564b896
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!410
5 years ago
Sultan Khan
fed33ae4dc
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
fee23de1fd
hhc changes
5 years ago
Elham Rababh
ad0c8eaffb
fix scaffold
5 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
5 years ago
Mohammad Aljammal
9e31d497ed
fix wish list issue
5 years ago
Mohammad Aljammal
361b72624b
Merge branch 'pharmacy_fix' into 'development'
...
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!407
5 years ago
Mohammad Aljammal
73f2fd33d4
Merge branch 'product_detail_page' into 'development'
...
Product detail page
See merge request Cloud_Solution/diplomatic-quarter!408
5 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
5 years ago
Elham Rababh
bb96201c2e
remove the custom scaffold
5 years ago
Sikander Saleem
28c0450544
lab result filterName improvement.
5 years ago
hussam al-habibeh
f3000d0ee3
My account design fix
5 years ago
Elham Rababh
e20e90c20c
fix quantity_box
5 years ago
haroon amjad
99b87b1f84
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
fixes
See merge request Cloud_Solution/diplomatic-quarter!406
5 years ago
haroon amjad
f6d779431a
fixes
5 years ago
haroon amjad
ba79baa803
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
...
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!405
5 years ago
haroon amjad
8133f8a23a
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
13debe83f0
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!404
5 years ago
haroon amjad
46cc73bdd7
CMC changes
5 years ago
Sultan Khan
6159be0f75
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
5fe0214e04
bug fixes
5 years ago
haroon amjad
8cc36ae848
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
dfafb6b664
fixes
5 years ago
Mirza.Shafique
c23478b838
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
205b4d6b21
Photo view in CMC
5 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
5 years ago
Elham Rababh
d5f1a162c0
replace bottom sheet button
5 years ago
hussam al-habibeh
85e6032875
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
5 years ago
Mohammad Aljammal
1c1fcb00cb
Merge branch 'pharmacy_fix_bugs' into 'development'
...
fix bugs pharmacy home
See merge request Cloud_Solution/diplomatic-quarter!402
5 years ago
mosazaid
185d66e342
fix bugs pharmacy home
5 years ago
hussam al-habibeh
d4fd95606e
add pharmacy icons for bottom nav
5 years ago
Sikander Saleem
d1f3428def
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
df32ae0142
lab order clinic/hospital name, prescription reminder ui, prescription availibility
5 years ago
haroon amjad
879ce4ee06
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
7675a4496a
my vaccine & lab result fix
5 years ago
Sultan Khan
a4ab22a4aa
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
5b988dff4f
BUG FIXES
5 years ago
Mirza.Shafique
5e383e57d9
CMC error Fixes
5 years ago
Elham Rababh
6fe41382c0
first step from design
5 years ago
Sikander Saleem
3403e07aba
recall prescription order log when refill or cancel order.
5 years ago
mosazaid
c558fe6bd9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
5 years ago
mosazaid
f47d59c43f
fix bugs pharmacy home
5 years ago
Haroon Amjad
062ca5c11c
EReferral fixes
5 years ago
Haroon Amjad
abcb71e86e
Invoice details UI revamped
5 years ago
haroon amjad
c91b8ce777
My Vaccines design revamped
5 years ago
Elham Rababh
2839af658a
fix issues
5 years ago
haroon amjad
dfeb249a54
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
a4a2389a78
updates & fixes
5 years ago
Sikander Saleem
f63293ef3e
login input rtl
5 years ago
mosazaid
fdb61c78c5
fix bugs pharmacy home
5 years ago
Mohammad Aljammal
8e30860fc2
Merge branch 'pharmacy_fix' into 'development'
...
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!401
5 years ago
Sultan khan
d63f0cd1a3
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!400
5 years ago
Sultan Khan
fc9f2fc34e
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
08933632d3
tracker services done rrt in progress
5 years ago
Sultan Khan
1205f93c8a
tracker services done rrt in progress
5 years ago
hussam al-habibeh
9a2d52309c
products categories page fix
5 years ago
Sikander Saleem
5bdb56df60
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
aff7b25566
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Sikander Saleem
2bf28e3bef
imp files added
5 years ago
Sikander Saleem
5fda70decf
cmc & hhc order log ui improvements.
5 years ago
hussam al-habibeh
cb2b9db0ab
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
5 years ago
Mirza.Shafique
bc246b2f9f
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
f0566fb069
CMC Images
5 years ago
Mohammad Aljammal
767a4fc835
Merge branch 'fix_product_tile' into 'development'
...
Fix product tile
See merge request Cloud_Solution/diplomatic-quarter!399
5 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
5 years ago
Mohammad Aljammal
43e7bb9ff3
fix bottom navigation bar
5 years ago
Mohammad Aljammal
7cc5ec58d1
Merge branch 'pharmacy_fix_bugs' into 'development'
...
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!398
5 years ago
mosazaid
a398ede172
fix bugs pharmacy home
5 years ago
hussam al-habibeh
2265487ccd
remove cart cout & icon from AppBar
5 years ago
Elham Rababh
769dc4e0ac
first step of ProductDetailPage refactor
5 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
5 years ago
Elham Rababh
c7a0d39aab
first step of ProductDetailPage refactor
5 years ago
haroon amjad
184942e891
Covid Payment fixes
5 years ago
haroon amjad
ab8030416c
Updates & fixes
5 years ago
hussam al-habibeh
806e07e4e6
products categories page fix
5 years ago
Mirza.Shafique
9b160958bb
Covid New Design 3
5 years ago
mosazaid
f329eea798
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
5 years ago
mosazaid
01a77d5352
fix bugs pharmacy
5 years ago
Mohammad Aljammal
d64e2a469f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
5 years ago
Mohammad Aljammal
8ecd4a24d8
fix product tile
5 years ago
Mohammad Aljammal
8c7f397ac8
Merge branch 'pharmacy_fix' into 'development'
...
Pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!397
5 years ago
hussam al-habibeh
dbf7ebf287
fix most viewed & best sellers moduls
5 years ago
Mohammad Aljammal
edffa96925
Merge branch 'brands' into 'development'
...
Brands
See merge request Cloud_Solution/diplomatic-quarter!396
5 years ago
Elham Rababh
db277a62f5
fix brand design
5 years ago
Elham Rababh
a6a7ed4e1b
remove cart from product details
5 years ago
Elham Rababh
9b42d411ca
remove cart from product details
5 years ago
haroon amjad
0955a22616
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
fa8c739b2c
updates & fixes
5 years ago
Mirza.Shafique
6e244a55f5
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
7563a2870b
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
b80e2ea16e
Covid New Design 2
5 years ago
Sikander Saleem
74432b6bbb
cmc order log ui changes
5 years ago
haroon amjad
46d800c0c6
UI updates & fixes
5 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
5 years ago
Mirza.Shafique
5b330b2a25
Covid New Design
5 years ago
Elham Rababh
cc88f0f81e
first step of fixing
5 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
5 years ago
Sikander Saleem
4ce941e01e
prescription order log detail view change on arabic
5 years ago
Sikander Saleem
c96fa62363
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
e36e0ce0b7
h20 bottom nav bar bug fix (happen in release mode)
5 years ago
hussam al-habibeh
7427cd68ff
fix bottom nav bar ui
5 years ago
haroon amjad
19e6954bc8
updates
5 years ago
haroon amjad
c3feed771c
merge conflicts resolved
5 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
5 years ago
Sultan khan
2ae5c8f657
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!395
5 years ago
haroon amjad
b0f4cfcff3
Family file fixes
5 years ago
Sultan Khan
e48d4e5eb2
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
c54146b3ba
sechedule fix
5 years ago
haroon amjad
2fc5425884
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
f55fbd1cc2
UI fixes
5 years ago
Sultan khan
4fb2c24072
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!394
5 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
5 years ago
haroon amjad
a075d53dd5
UI updates & fixes
5 years ago
Sultan Khan
54ac31a74c
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
a57facb876
family file fix
5 years ago
Sultan Khan
c58023efc3
family file fixes
5 years ago
Sikander Saleem
7b8093b7ba
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
c1b23b7c2a
improvements
5 years ago
Mirza.Shafique
e24eaa791b
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
5b47aaac6f
icon and find us distance
5 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
5 years ago
Sikander Saleem
0348397df3
insurance approval detail company name added.
5 years ago
Sikander Saleem
4a30c59f83
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
e37781c3a6
insurance approval screen and detail screen ui changes.
5 years ago
haroon amjad
ba7d0329c3
Dental Invoices UI
5 years ago
haroon amjad
af7b27258c
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
Sultan khan
ed468c6fad
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!393
5 years ago
Sultan Khan
0e43ca173a
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
d535cb421d
bug fixes
5 years ago
haroon amjad
f9b57ce4aa
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
4ac0845003
updates & fixes
5 years ago
Mirza.Shafique
719cdbd2e4
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
8a4cf9f23b
Line Chart Fix in Vital Signs
5 years ago
Sikander Saleem
baf4eab604
prescription order detail ui changes
5 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
5 years ago
haroon amjad
92bfe27a6e
updates & fixes
5 years ago
Sikander Saleem
4caacb968b
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
d9405b2bd0
prescription order log ui changes
5 years ago
Sikander Saleem
8e27d8210a
prescription detail ui changes.
5 years ago
Mirza.Shafique
350882b1d2
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
ef2bcc1c65
Web RTC Design implementation
5 years ago
haroon amjad
ad3463bbfc
active medication design revamped
5 years ago
haroon amjad
bf4709fef6
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/medical/prescriptions/prescription_details_page.dart
5 years ago
haroon amjad
304ba8afa4
bas app client fixes
5 years ago
Sikander Saleem
8cb342cb24
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
9d67704c67
prescription detail ui changes(cont).
5 years ago
Sultan khan
dfd01d3033
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
login issue fixed
See merge request Cloud_Solution/diplomatic-quarter!392
5 years ago
Sultan Khan
2ebfdcfdd7
login issue fixed
5 years ago
Sikander Saleem
259163481c
Merge branch 'development_new_design_2.0' into new_design_sikander
5 years ago
haroon amjad
05354f72cc
pharmacy import fixes
5 years ago
haroon amjad
b51989e798
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/pages/pharmacies/compare.dart
# lib/pages/pharmacies/my_reviews.dart
# lib/pages/pharmacies/wishlist.dart
5 years ago
haroon amjad
b3dffc992c
App expandable fixes
5 years ago
haroon amjad
a2e25f7a7a
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
98837b2298
WebRTC implementation
5 years ago
Sikander Saleem
f0bb94c422
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
4e0197965c
prescription ui changes(cont).
5 years ago
Mirza.Shafique
999a45c711
App Expendable Design Change
5 years ago
haroon amjad
1200dbeb70
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
322a32be21
WebRTC Implementing
5 years ago
haroon amjad
d9d4720ded
pubspec updated
5 years ago
haroon amjad
c050633671
SignalR Updates
5 years ago
Sultan khan
01f88229d3
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!391
5 years ago
Sultan Khan
a53d51a899
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
f9f5a886a9
VITAL SIGN FIXED
5 years ago
haroon amjad
0a90791aca
Push notification fixes
5 years ago
haroon amjad
eeb20073cb
Medicine prescriptions fixes from appointment details page
5 years ago
haroon amjad
298a8f4cff
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
# lib/pages/DrawerPages/family/my-family.dart
5 years ago
haroon amjad
b1128be94f
Updates & fixes
5 years ago
Sultan khan
585d8067ad
Merge branch 'sultan_new_design' into 'development_new_design_2.0'
...
Sultan new design
See merge request Cloud_Solution/diplomatic-quarter!390
5 years ago
Sultan Khan
1d36076320
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
5 years ago
Sultan Khan
dd58b8637b
bug fixs
5 years ago
haroon amjad
e5a636b704
Covid Test changes
5 years ago
Fatimah Alshammari
b3285f4528
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/pages/sub_categorise_page.dart
5 years ago
Fatimah Alshammari
bdededa397
fixed arabic version
5 years ago
Mohammad Aljammal
cfe9e35c38
Merge branch 'blood_pressure' into 'development'
...
parent product and sub product update
See merge request Cloud_Solution/diplomatic-quarter!389
5 years ago
hussam al-habibeh
e4d54f0c0b
parent product and sub product update
5 years ago
hussam al-habibeh
f1c2dbbbfc
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
...
Conflicts:
lib/pages/parent_categorise_page.dart
lib/pages/sub_categorise_page.dart
5 years ago
hussam al-habibeh
0a1db70229
parent product and sub product update
5 years ago
haroon amjad
e8bb4e962c
Merge branch 'development_new_design_2.0' into haroon-new-design
...
# Conflicts:
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
5 years ago
Mirza.Shafique
ad3fbdf323
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
717c7b3be4
Lab results designs enhancements
5 years ago
Zohaib Iqbal Kambrani
581bbe63bb
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter :
Images deleted from assets
CMC 1.7
CMC 1.6
CMC 1.5
5 years ago
Zohaib Iqbal Kambrani
3f178e3e3f
Google_Huawei Map -> AppMap
5 years ago
Mohammad Aljammal
1d7e97a9af
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!386
5 years ago
Fatimah Alshammari
a4bf52818e
Merge branch 'development' into fatima-new
5 years ago
Fatimah Alshammari
7ebeb8cb4b
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/pages/parent_categorise_page.dart
# lib/pages/sub_categorise_page.dart
5 years ago
Fatimah Alshammari
bcfbca98a1
fixed arabic version
5 years ago
Mohammad Aljammal
473f372a85
Merge branch 'blood_pressure' into 'development'
...
fix pharmacy products filtering
See merge request Cloud_Solution/diplomatic-quarter!388
5 years ago
hussam al-habibeh
cb9d8cb9d9
fix pharmacy products filtering
5 years ago
hussam al-habibeh
b0165c0d29
fix pharmacy products filtering
5 years ago
Mirza.Shafique
275b95be99
Images deleted from assets
5 years ago
haroon amjad
7467da7409
Imports organized
5 years ago
Fatimah Alshammari
2caf4d4837
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Fatimah Alshammari
8c0dca781c
fixed compare issues and arabic version
5 years ago
Mirza.Shafique
dfc6e3bbc1
CMC 1.7
5 years ago
haroon amjad
c186c9f186
Merge branch 'development_new_design_2.0' into haroon-new-design
5 years ago
haroon amjad
0fe4a21388
updates & fixes
5 years ago
Mirza.Shafique
d7314f7555
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
96b971ef01
CMC 1.6
5 years ago
haroon amjad
32462ff5ba
covid translation updates
5 years ago
haroon amjad
f946a7be4d
updates & fixes
5 years ago
Mirza.Shafique
f20883184e
CMC 1.5
5 years ago
Sultan Khan
32f62fbe56
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
c6fd52aad2
home health care
5 years ago
haroon amjad
948f4fc6b8
CMC Add address fixes
5 years ago
Sultan Khan
4d00664045
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
c6404a2a0b
tracker services
5 years ago
haroon amjad
74ca9995c9
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
5 years ago
haroon amjad
2d7c7239c5
Health Converters fixes
5 years ago
Mirza.Shafique
2d38e8905b
CMC 1.4
5 years ago
haroon amjad
2bba42b574
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
haroon amjad
f795ba24c5
updates & fixes
5 years ago
Mirza.Shafique
d1bc46f451
CMC Marge
5 years ago
Mirza.Shafique
a67c5afcfb
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
e890c80831
CMC 1.3
5 years ago
Mohammad Aljammal
9fb4e79c34
Merge branch 'sep_fixes' into 'development'
...
Sep fixes
See merge request Cloud_Solution/diplomatic-quarter!387
5 years ago
Elham Rababh
bb372210e0
PAP-938: fix Referral sent
5 years ago
Elham Rababh
bff7020b78
PAP-939: fixes
5 years ago
haroon amjad
f33272f8d9
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
haroon amjad
ec646a7039
My Invoice fixes, Prescription page fixes
5 years ago
Mirza.Shafique
b3f3558eac
CMC 1.2
5 years ago
Mirza.Shafique
82a1d410db
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/landing/widgets/logged_slider_view.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
2019e804f0
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
169aafa26b
hmc services design fixed
5 years ago
Mirza.Shafique
831780555c
CMC 1.0
5 years ago
haroon amjad
2669378da4
Insurance Approval API updated
5 years ago
haroon amjad
aadcfdc7bc
Insurance Approval fixes
5 years ago
haroon amjad
5396138962
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/ToDoList/payment_method_select.dart
# lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
haroon amjad
3bb0a8b85b
Apple Pay finalized, Translation issues fixed, other updates
5 years ago
Sikander Saleem
aa047afef7
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
5 years ago
Mirza.Shafique
afb08fcd0a
Booking Filters Update
5 years ago
Mirza.Shafique
3af1676730
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/insurance/insurance_card_screen.dart
# lib/pages/medical/balance/advance_payment_page.dart
# lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
Mirza.Shafique
a234618df8
Update, Insurance card and My Balance Design
5 years ago
Sikander Saleem
1db8c96ed7
title improvement for book appointment clinic search.
5 years ago
haroon amjad
ebcc2559ce
Ask doctor issue resolved, Translation & font family issues resolved
5 years ago
haroon amjad
25fb5decc0
Ask Doctor page fixes
5 years ago
haroon amjad
106489b085
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
haroon amjad
d4a4165ef3
Minor fixes in Eye Measurements
5 years ago
Sultan Khan
671c432cd7
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
0086875d0d
Design Updated for tracker
5 years ago
Sikander Saleem
a09b43ef8c
monthly report ui redesigned.
5 years ago
Sikander Saleem
120e6c166d
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
c84707ba3f
monthly report request & sick leaves ui redesigned.
5 years ago
haroon amjad
9ffe064a3b
updates & fixes
5 years ago
Sikander Saleem
cd85ad4f8a
feedback ui redesigned.
5 years ago
haroon amjad
45272d251c
Updates & fixes
5 years ago
haroon amjad
8e7786cb96
updates & fixes
5 years ago
Fatimah Alshammari
62167baec5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Fatimah Alshammari
6d72be2a73
fixed cart order issues
5 years ago
Sikander Saleem
1b7b7b6334
live chat ui redesigned.
5 years ago
Sultan Khan
d2d22ff1fc
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sikander Saleem
d1b7c94d6e
improvement.
5 years ago
Sultan Khan
73ff5c4707
Bug fixes
5 years ago
Sikander Saleem
d9c1b8b8ea
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/main.dart
# lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
# lib/pages/medical/eye/EyeMeasurementsPage.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
5 years ago
haroon amjad
ab0e388cbe
Merge branch 'Haroon' into 'development'
...
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!385
5 years ago
haroon amjad
4469ae1209
updates & fixes
5 years ago
Sikander Saleem
ef5f737084
Merge branch 'development' into development_new_design_2.0
5 years ago
Mirza.Shafique
4f85652562
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
f577905dcb
eye measurment new design
5 years ago
haroon amjad
e679c7df0d
updates & fixes
5 years ago
haroon amjad
b90c189b6d
Merge branch 'Haroon' into 'development'
...
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!384
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
75c0de091f
Merge branch 'Haroon' into 'development'
...
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!383
5 years ago
haroon amjad
44d59ed01a
updates & fixes
5 years ago
Sikander Saleem
e3758cfbba
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
ff5fbbdf7c
Service info app bar fixed.
5 years ago
Sikander Saleem
fab051f9e7
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sikander Saleem
6a86d8d1c1
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
62ca009404
improvement.
5 years ago
Sultan Khan
c6e7c8cd37
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
52665fe217
login issue fixed
5 years ago
Mohammad Aljammal
55f9bbcba4
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
5 years ago
Sikander Saleem
7df76842b2
Merge branch 'development_new_design_2.0' into new_design_sikander
5 years ago
Sikander Saleem
a61fea551c
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
f3d7686a10
improvement.
5 years ago
Sultan Khan
ad7527ee65
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
5 years ago
Sultan Khan
233a273316
shcedule page
5 years ago
Mirza.Shafique
3f0d8626e7
Marge issue
5 years ago
Mirza.Shafique
590ea48ea9
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
5 years ago
Mirza.Shafique
e1e3741abf
Event Reminder
5 years ago
haroon amjad
b83318faf8
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
5 years ago
haroon amjad
f8c295defe
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
5 years ago
haroon amjad
8cb9a5e619
updates
5 years ago
haroon amjad
faff3b90cb
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/core/service/er/am_service.dart
5 years ago
haroon amjad
e9ec2e2faf
Ambulance request APIs revamped
5 years ago
Zohaib Iqbal Kambrani
d9672c47a0
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
BUG FIXES
fix issues PAP-910,PAP-911
fix bugs pharmacy
Dental procedures implemented
Revert "Merge branch 'foote_in_all_pages' into 'development'"
fixed products issues
calendar events changes
Covid passport CR implemented in Covid test flow
doctor schedule
Covid certificate passport CR implemented
Covid Lab result generate certificate implemented
return bottom sheet inside appointments list
fix issues related to footer
remove unused code
remove footer from pharmacy pages
first step from add footer for all pages
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
abcd207554
schedule page fix
5 years ago
haroon amjad
3abd7227ec
fixes
5 years ago
haroon amjad
9cf9e297cf
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
...
# Conflicts:
# lib/pages/MyAppointments/AppointmentDetails.dart
5 years ago
haroon amjad
4560037f97
updates
5 years ago
Fatimah Alshammari
f09cdd944d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
827d8733a1
fixed shopping cart issue
5 years ago
Sikander Saleem
402cf5936a
improvement.
5 years ago
Sikander Saleem
1a0e1f47a6
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/components/DocAvailableAppointments.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
bf920d4188
find us redesigned.
5 years ago
Sultan khan
ba245fdfef
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!378
5 years ago
Sultan Khan
1726f8cc11
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
d1fc4751ad
BUG FIXES
5 years ago
Mirza.Shafique
ebf293736d
Booking appointment Marge
5 years ago
Zohaib Iqbal Kambrani
d1c99d1d82
ER Average waiting time label applied
5 years ago
haroon amjad
4c2b70fcb5
Merge branch 'development' into Haroon
5 years ago
haroon amjad
21c3686e05
Ambulance request services revamping
5 years ago
Sikander Saleem
363cf78884
improvement.
5 years ago
Sikander Saleem
b78f8f76db
improvement.
5 years ago
Sikander Saleem
1c020134e8
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
bdb7f29d4c
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/BookAppointment/DentalComplaints.dart
# lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
d2d27631ac
Merge branch 'fix_30_Aug' into 'development'
...
fix issues PAP-910,PAP-911
See merge request Cloud_Solution/diplomatic-quarter!376
5 years ago
Mirza.Shafique
089ad0d321
Booking appointment 1.3
5 years ago
Elham Rababh
2e2f7334d5
fix issues PAP-910,PAP-911
5 years ago
Sikander Saleem
cfa3ca62b6
prescription tab bar improvement.
5 years ago
Sikander Saleem
3cc18cfb24
medical reports ui redesigned.
5 years ago
Sikander Saleem
9fdebc2db7
ask doctor ui redesigned
5 years ago
Fatimah Alshammari
b6981299d9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Fatimah Alshammari
239ad530ce
fixed isuues
5 years ago
Mohammad Aljammal
36142f0f6d
Merge branch 'fix_bug_pharmacy' into 'development'
...
fix bugs pharmacy
See merge request Cloud_Solution/diplomatic-quarter!375
5 years ago
Mohammad Aljammal
8abbb04f02
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!373
5 years ago
mosazaid
a2e60e7584
fix bugs pharmacy
5 years ago
haroon amjad
e9c26ee85f
Dental procedures implemented
5 years ago
Sikander Saleem
ca363adee2
merge & improvements
5 years ago
Sikander Saleem
6191377914
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
5 years ago
Mohammad Aljammal
e97354e574
Merge branch 'revert-68491631' into 'development'
...
Revert "Merge branch 'foote_in_all_pages' into 'development'"
See merge request Cloud_Solution/diplomatic-quarter!374
5 years ago
Mohammad Aljammal
8b3a0b3ada
Revert "Merge branch 'foote_in_all_pages' into 'development'"
...
This reverts merge request !369
5 years ago
Fatimah Alshammari
72ba0c7c74
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Fatimah Alshammari
f3b545ff74
fixed products issues
5 years ago
Sikander Saleem
9e75a45cd5
improvement.
5 years ago
Sikander Saleem
8367fc09f3
Merge branch 'new_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem
d605084a91
appointment list and detail ui changed
5 years ago
Sultan Khan
b116079843
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
1a501a3b2a
calendar events changes
5 years ago
Mirza.Shafique
ad025f3d8e
Booking appointment 1.2
5 years ago
haroon amjad
1db2f9ab03
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!372
5 years ago
haroon amjad
0d1d68273b
Covid passport CR implemented in Covid test flow
5 years ago
Sultan Khan
4325bd3448
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
5fe6a6c3dd
doctor schedule
5 years ago
Mirza.Shafique
ba0c0beef6
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
d2b2b4063d
Booking appointment 1.1
5 years ago
haroon amjad
72dbdd2c2b
Merge branch 'development' into Haroon
5 years ago
haroon amjad
e96157c74a
Covid certificate passport CR implemented
5 years ago
Mohammad Aljammal
68491631f3
Merge branch 'foote_in_all_pages' into 'development'
...
Foote in all pages
See merge request Cloud_Solution/diplomatic-quarter!369
5 years ago
Mohammad Aljammal
79430e2243
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Covid Drive-Thru Questions Screen
See merge request Cloud_Solution/diplomatic-quarter!371
5 years ago
Zohaib Iqbal Kambrani
d33432d238
Covid Drive-Thru Questions Screen
5 years ago
haroon amjad
73097d15de
Covid Lab result generate certificate implemented
5 years ago
haroon amjad
d83a611d95
FCM Permission fix
5 years ago
Mirza.Shafique
bd1cf9bcc7
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mirza.Shafique
62631677ad
Booking appointment 1.0
5 years ago
Sikander Saleem
4152eafa17
Merge branch 'development_new_design_2.0' into new_design_sikander
5 years ago
Sikander Saleem
2ba91e54ab
merge-changes
5 years ago
Sikander Saleem
94ff5cff40
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
970887b0c5
changes
5 years ago
Elham Rababh
9777b3f2ab
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
5 years ago
haroon amjad
6a692ebd08
Merge branch 'Haroon' into 'development'
...
Dental flow fixes
See merge request Cloud_Solution/diplomatic-quarter!368
5 years ago
Elham Rababh
ceeda154d5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
5 years ago
haroon amjad
5f521556dc
Dental flow fixes
5 years ago
Sikander Saleem
acd3855c77
Merge branch 'development' into development_new_design_2.0
5 years ago
Sikander Saleem
71f888ea9b
improvements
5 years ago
Sikander Saleem
288d64214e
improvements
5 years ago
Sikander Saleem
bb18645d85
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan khan
7348baa62c
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!367
5 years ago
haroon amjad
3235f489b9
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
51c398e84a
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
e9db30d3da
otp clear when wrong code entered.
5 years ago
haroon amjad
5009e48f64
Updates in Ambulance Request & Covid test
5 years ago
Sultan khan
66f6b403c0
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!366
5 years ago
Sultan Khan
301728ed3d
family file fix
5 years ago
Mirza.Shafique
ca3495d71c
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
0a83cf8241
Bug Fixis
5 years ago
Sultan Khan
59892870e2
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9e31a3c560
bug fixes
5 years ago
Sikander Saleem
5ab9dd1761
Appointment screen Changes & improvements.
5 years ago
Mirza.Shafique
374a14eac4
Merge branch 'development_new_design_2.0' into mirza_home_page
5 years ago
Mirza.Shafique
2a4e0a604a
Medical Perscription 1.1
5 years ago
haroon amjad
3f29bbd6b3
Updates & fixes
5 years ago
Mohammad Aljammal
db128e5091
Merge branch 'blood_pressure' into 'development'
...
fix prescription add reminder
See merge request Cloud_Solution/diplomatic-quarter!363
5 years ago
Elham Rababh
1fefbfb76e
return bottom sheet inside appointments list
5 years ago
Sultan Khan
57d87dfc03
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
11ffed2ae3
bug fixes
5 years ago
Elham Rababh
13737548bb
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
5 years ago
haroon amjad
f98f1dae88
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!364
5 years ago
haroon amjad
cbbca5ce86
Merge branch 'development' into Haroon
5 years ago
Sikander Saleem
458dc2474b
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
047941fffc
Merge branch 'new_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
5647ab75e5
improvements.
5 years ago
Mirza.Shafique
b2bba050e8
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/new_design/doctor_header.dart
5 years ago
Elham Rababh
ab2fc6aa2c
fix issues related to footer
5 years ago
hussam al-habibeh
428b45528b
fix prescription add reminder
5 years ago
Mirza.Shafique
8c8a9c7ce2
Medical Perscription 1.0
5 years ago
Sikander Saleem
350ff20a1a
my doctor screen.
5 years ago
Mohammad Aljammal
b98a84bcac
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!361
5 years ago
Mohammad Aljammal
41f1704790
Merge branch 'blood_pressure' into 'development'
...
Blood pressure
See merge request Cloud_Solution/diplomatic-quarter!362
5 years ago
Sikander Saleem
ec6693c55e
improvement.
5 years ago
haroon amjad
0121337d1b
LiveCare Flow from book appointment flow implemented
5 years ago
Mirza.Shafique
24b7a8a4c4
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Sikander Saleem
6c8f1c6185
merge improvement.
5 years ago
Mirza.Shafique
cbadcd5feb
Vital Sings Detail Page 1.0
5 years ago
Sikander Saleem
197e7d5742
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
5 years ago
Elham Rababh
f85c359cf4
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh
d028ce22dc
remove unused code
5 years ago
hussam al-habibeh
fe83b91602
body fat texfield fix
5 years ago
Elham Rababh
69df61afb1
remove footer from pharmacy pages
5 years ago
Mirza.Shafique
e91cf4762a
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
d865e97ce1
Vital Sings Home Page
5 years ago
Sikander Saleem
b3fd1cb93d
lab result detail flow chart screen & improvement.
5 years ago
hussam al-habibeh
864f849425
Baby age in ovulation period
5 years ago
Fatimah Alshammari
787b55a803
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
...
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
34ccb132dc
fixed issues
5 years ago
Mohammad Aljammal
10f4a30921
Merge branch 'fix_feedback' into 'development'
...
Fix feedback
See merge request Cloud_Solution/diplomatic-quarter!360
5 years ago
Mohammad Aljammal
d9fabbab17
Fix feedback
5 years ago
Fatimah Alshammari
d3eeaa15ac
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
74d0826342
fixed issues
5 years ago
Sultan khan
04a68c5bd3
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!358
5 years ago
Sultan khan
b8d75b5604
Merge branch 'blood_pressure' into 'development'
...
add blood pressure translation issue
See merge request Cloud_Solution/diplomatic-quarter!356
5 years ago
Sultan khan
6a0acd8afb
Merge branch 'fix-bugs' into 'development'
...
Fix bugs
See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
Sultan Khan
5b656b0b51
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9610ff640e
feedback changes
5 years ago
haroon amjad
335bc9a673
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!357
5 years ago
haroon amjad
cbbef80bd5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
eadba3f767
Working on livecare appointment booking page
5 years ago
hussam al-habibeh
b9d4195e20
Blood pressure translation issue
5 years ago
hussam al-habibeh
9c6f83600b
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
mosazaid
3077624c58
fix bugs
5 years ago
Sultan khan
3c2a89cd8e
Merge branch 'Aug_fixes' into 'development'
...
fix issues related to wight and sugar blood
See merge request Cloud_Solution/diplomatic-quarter!354
5 years ago
Sultan khan
cd56881d7a
Merge branch 'pharmacy-bugs' into 'development'
...
hide Covid19-driveThrow for patient out of KSA
See merge request Cloud_Solution/diplomatic-quarter!353
5 years ago
Sultan khan
8eb67791ca
Merge branch 'fatima-new' into 'development'
...
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!349
5 years ago
Sultan khan
d321f07e82
Merge branch 'medication_availability' into 'development'
...
Medication availability
See merge request Cloud_Solution/diplomatic-quarter!348
5 years ago
Elham Rababh
8629b62fcb
fix issue
5 years ago
Elham Rababh
1568698b98
fix issues related to wight and sugar blood
5 years ago
Sikander Saleem
6ee56cba0d
Merge branch 'login_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem
bb20d65b40
lab result detail screen.
5 years ago
Mirza.Shafique
66efbc1bac
Radiology Implementation
5 years ago
hussam al-habibeh
8f5fef87e9
add blood pressure translation issue
5 years ago
Mirza.Shafique
26c30038c9
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
29fd552874
Weight, height and blood pressure on Home Page
5 years ago
Sikander Saleem
35b5d38b82
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
3a1af590ff
lab result detail screen (cont.)
5 years ago
hussam al-habibeh
a33a6b0b2f
push request after conflict resolve
5 years ago
hussam al-habibeh
0a3c44b5e8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
352cda4c70
hide Covid19-driveThrow for patient out of KSA
5 years ago
Elham Rababh
8626b4f269
first step from add footer for all pages
5 years ago
mosazaid
b59ca8dedd
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs
5 years ago
haroon amjad
5c8e9f4e19
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad
2242b78116
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
haroon amjad
a3984a7c1a
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!351
5 years ago
haroon amjad
e28fdaade1
Dental Invoices implementation completed
5 years ago
Zohaib Iqbal Kambrani
c215b22cf7
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fixes
registration
5 years ago
Zohaib Iqbal Kambrani
f442cc251c
Pre Post Images Dental Doctor Profile
5 years ago
Mirza.Shafique
876463c945
Home Page Font weight
5 years ago
Sikander Saleem
d1b45c8bcc
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Mirza.Shafique
85c759a4a5
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Sikander Saleem
5b778f0493
appointment ui (cont.) & improvement.
5 years ago
Sultan khan
91a363a1ef
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!350
5 years ago
Sultan Khan
1586f02542
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
6b7eaaafb9
fixes
5 years ago
Mirza.Shafique
a699740897
Medical File Fonts Implementation
5 years ago
Mirza.Shafique
5f44dece71
Ganaric Font and font implementaion
5 years ago
Fatimah Alshammari
bf4cbaefbd
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
bbb8e04066
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
5 years ago
Sultan khan
ce867b85f2
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!347
5 years ago
haroon amjad
a32501f3dc
My invoices implementation continued
5 years ago
Sikander Saleem
ff55ae1908
improvements
5 years ago
Sikander Saleem
bb3d11ccf8
remove spaces.
5 years ago
Sikander Saleem
56c0adaada
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sikander Saleem
bb9d1bfcd5
improvements
5 years ago
hussam al-habibeh
4b90f16ab9
baby age in ovulation period
5 years ago
Fatimah Alshammari
e86dfd1a34
Merge branch 'development' into fatima-new
5 years ago
Fatimah Alshammari
86d67247be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
0d3f6237ce
fixed issues
5 years ago
Sikander Saleem
80c50e29bf
Merge branch 'login_design_sikander' into development_new_design_2.0
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem
4db432b351
lab results working(cont.) & improvements
5 years ago
Sultan Khan
b1453b52e3
registration
5 years ago
Mirza.Shafique
38465eaafb
Home page icons and drawer
5 years ago
Zohaib Iqbal Kambrani
429fcb1e60
Merge branch 'development' into ZohaibIqbalKambrani
...
* development: (32 commits)
changes
package name changed
Jira Fixes
Jira fixes
PAP-664
PAP-664
PAP-664
langauge issue
bug fix
PAP-777
PAP-729
fix button
fix translate issues
CONFIG
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
bug fixes
fix bugs
fixing dashboard issue
fixing dashboard issue
jira bugs
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
5 years ago
hussam al-habibeh
d3868844de
Medication availability
5 years ago
Mirza.Shafique
1bea9d39b5
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
06f877b8d4
Home page new design & drawer
5 years ago
Sultan Khan
57864f949d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Sultan Khan
bd85854fa4
changes
5 years ago
Zohaib Iqbal Kambrani
10a147860c
no message
5 years ago
Zohaib Iqbal Kambrani
bf303a7be0
RRT Implementation
5 years ago
Sultan khan
1f52794185
Merge branch 'sultan-patientapp' into 'development'
...
package name changed
See merge request Cloud_Solution/diplomatic-quarter!345
5 years ago
Sultan Khan
97d7f9225e
package name changed
5 years ago
haroon amjad
b5f180f16c
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!344
5 years ago
haroon amjad
709877b5f1
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad
cf32d9f0ff
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
haroon amjad
90db04cee1
Jira Fixes
5 years ago
Sultan khan
69e957929d
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!343
5 years ago
Fatimah Alshammari
b8ba80b361
Merge branch 'fatima-new' into development
5 years ago
Fatimah Alshammari
39ba2cfde7
fixed issues.
5 years ago
Sikander Saleem
2d64426cd4
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
Sikander Saleem
70614d3555
merge improvements-1.
5 years ago
haroon amjad
5007064105
Jira fixes
5 years ago
Mirza.Shafique
99c6318410
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
2d62822536
Medical Profile Page improvements
5 years ago
Sikander Saleem
f482595d6b
merge improvements.
5 years ago
Sikander Saleem
083d696c62
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
4ebf5f900b
improvements.
5 years ago
Mirza.Shafique
32e867421f
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/date_uitl.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique
e9e3b079b3
Medical Profile Complete 1.1
5 years ago
hussam al-habibeh
02df6f4d85
PAP-664
5 years ago
hussam al-habibeh
60aaf2a31a
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh
352fd912de
PAP-664
5 years ago
hussam al-habibeh
29249dc9a9
PAP-664
5 years ago
Sultan khan
b2349394ff
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!342
5 years ago
Sultan Khan
e1750ce24c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e5fb16ad69
langauge issue
5 years ago
Mirza.Shafique
bbaeec5b85
Medical Profile Complete
5 years ago
Sikander Saleem
6575adda42
merge changes-5
5 years ago
Sikander Saleem
f6ae7ed770
merge changes-4
5 years ago
Sikander Saleem
889ae24f07
merge changes-3
5 years ago
Sikander Saleem
c07a8f54c7
merge changes-2
5 years ago
Sikander Saleem
14561d0ac6
merge changes-1
5 years ago
Sultan khan
08f7736030
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!341
5 years ago
Sultan Khan
c9fe036b99
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
1898c12ec3
Merge branch 'fix_merge_issues' into 'development'
...
fix translate issues
See merge request Cloud_Solution/diplomatic-quarter!340
5 years ago
Sultan Khan
7c398ba40d
bug fix
5 years ago
Sikander Saleem
a5d40f090a
improvements-test
5 years ago
hussam al-habibeh
146fc5d2b2
PAP-777
5 years ago
Mirza.Shafique
2665e4cd0c
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
5 years ago
Mirza.Shafique
a20185b2b9
Home page 1.4 (Homepage changes)
5 years ago
Sikander Saleem
2cb59a286f
Merge branch 'login_design_sikander' into development_new_design_2.0
5 years ago
haroon amjad
037a887e5c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Sikander Saleem
473315f8a1
improvements
5 years ago
hussam al-habibeh
6ea06ce442
PAP-729
5 years ago
Mirza.Shafique
3c438406b5
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem
53e4815866
no auth ui modifications
5 years ago
Mirza.Shafique
49bfa2e9a7
Home page 1.3
5 years ago
Elham Rababh
8b8e239d3f
fix button
5 years ago
Zohaib Iqbal Kambrani
e4256d6874
RRT in progress (Service implementations)
5 years ago
Elham Rababh
b01961e45f
fix translate issues
5 years ago
Sultan Khan
d88e3faa6b
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
d6fd03b571
CONFIG
5 years ago
Sultan khan
772dcba287
Merge branch 'Aug_fixes' into 'development'
...
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
See merge request Cloud_Solution/diplomatic-quarter!338
5 years ago
Sultan khan
ba32a37a17
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani
4da163d186
RRT in progress in stage
5 years ago
Sultan Khan
6534ca8349
Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
54e1d51f18
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!337
5 years ago
Zohaib Iqbal Kambrani
5f1d753895
no message
5 years ago
Sikander Saleem
907d90b987
login ui and forgot password ui added.
5 years ago
Sultan Khan
ed20ba65b3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Elham Rababh
7ad4e03c1a
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
5 years ago
Sultan Khan
23ca95b9b6
bug fixes
5 years ago
Mohammad Aljammal
9b3a679948
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
Mohammad Aljammal
b34402ffa8
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!335
5 years ago
Mohammad Aljammal
ed5079e3a0
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
mosazaid
a8413750c3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs
5 years ago
mosazaid
e9dbc4be7a
fix bugs
5 years ago
Haroon Amjad
47e521fe1d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
hussam al-habibeh
50d3a42743
fixing dashboard issue
5 years ago
hussam al-habibeh
1ed76e91aa
fixing dashboard issue
5 years ago
Sultan Khan
6442ce178d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
a67e320a8e
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
Sultan Khan
8766a69928
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
d83ae18d7b
Merge branch 'pharmacy-bugs' into 'development'
...
jira bugs
See merge request Cloud_Solution/diplomatic-quarter!332
5 years ago
hussam al-habibeh
d5c76b5400
jira bugs
5 years ago
hussam al-habibeh
6dc0d89f61
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
5 years ago
hussam al-habibeh
981e78936e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
08e0ce52c8
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fix bugs
5 years ago
Zohaib Iqbal Kambrani
4abdd9bde7
no message
5 years ago
Mohammad Aljammal
4ac6bf628b
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani
882d5f090a
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
...
* zik-analytics:
no message
5 years ago
mosazaid
2e33c2b240
fix bugs
5 years ago
Mirza.Shafique
b0dfbef52a
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Mirza.Shafique
d37f225c1b
Home page 1.2
5 years ago
Sikander Saleem
3707b13986
login type ui & icons added.
5 years ago
Sultan Khan
446f86dbcf
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
9f355440fc
Merge branch 'Aug_fixes' into 'development'
...
Aug fixes
See merge request Cloud_Solution/diplomatic-quarter!330
5 years ago
Elham Rababh
5d05b09345
PAP-712 : fixes on Blood sugar
5 years ago
Sultan Khan
c88bea4461
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9acb5b087d
bug fixes
5 years ago
Mirza.Shafique
090556f4d1
Merge branch 'mirza_home_page' into development_new_design_2.0
5 years ago
Mirza.Shafique
5dc88f51c3
Home Page 1.0
5 years ago
Sikander Saleem
8b2feb03ea
last login and login options ui.
5 years ago
Elham Rababh
86414b46fd
PAP-304 : show CBC details
5 years ago
Elham Rababh
52816a9cfe
PAP-723 : system should display the empty graph in the blood pressure screen.
5 years ago
Elham Rababh
f824063e82
PAP-726 : fix show Arabic values for the select Arm
5 years ago
Elham Rababh
f92567f877
PAP-718 : fix show data after save
5 years ago
Elham Rababh
f830bfdb19
PAP-722 : fix send email
5 years ago
Sikander Saleem
1ec48b9598
Poppins font added.
5 years ago
Sultan khan
9196367da4
Merge branch 'bug_fix_mirza' into 'development'
...
Medical Profile Buttons Lock
See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan
f54b9a63aa
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique
2fda47baf6
Medical Profile Buttons Lock
5 years ago
Zohaib Iqbal Kambrani
dbf525c484
no message
5 years ago
Haroon Amjad
213d104d57
Covid test procedure selection implemented
5 years ago
Sultan khan
487d63ec7f
Merge branch 'bug_fix_mirza' into 'development'
...
Check-In NFC
See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sultan khan
6c77edfa08
Merge branch 'bug_fixing' into 'development'
...
bug fixes and insurance approvals improvements.
See merge request Cloud_Solution/diplomatic-quarter!327
5 years ago
Sikander Saleem
eb9005510d
bug fixes and insurance approvals improvements.
5 years ago
Sultan Khan
3c2539d5b9
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
14ef096c32
changes and fixes
5 years ago
Mirza.Shafique
b31813770e
Check-In NFC done
5 years ago
Haroon Amjad
fde658fd5d
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
Mirza.Shafique
c3229b1dd8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza
5 years ago
Mirza.Shafique
107d50826c
nfc package test
5 years ago
Mirza.Shafique
fb0a67e5bd
PAP 828 and 792 issue fix
5 years ago
haroon amjad
96f1d9a1c1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Sultan khan
2447d006d2
Merge branch 'bug_fix_mirza' into 'development'
...
Merge fix mirza
See merge request Cloud_Solution/diplomatic-quarter!325
5 years ago
Mirza.Shafique
e934e7cd2c
Merge Fix
5 years ago
Mirza.Shafique
947b25a68c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza
5 years ago
haroon amjad
7cf66934bc
Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
4504b4bf75
config
5 years ago
haroon amjad
f310f9d0ab
config
5 years ago
haroon amjad
0d2a91c124
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
Sultan khan
81f751f552
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!324
5 years ago
Sultan khan
683e94edea
Merge branch 'pharmacy-bugs' into 'development'
...
jira bugs
See merge request Cloud_Solution/diplomatic-quarter!323
5 years ago
hussam al-habibeh
8d8fbc3edc
jira bugs
5 years ago
Sultan khan
15f620d720
Merge branch 'Jul_fixes' into 'development'
...
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
Sultan Khan
ce58141166
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan khan
bf78518c15
Merge branch 'pharmacy-bugs' into 'development'
...
jira bugs
See merge request Cloud_Solution/diplomatic-quarter!318
5 years ago
Sultan Khan
29c43e9757
splash image added
5 years ago
hussam al-habibeh
fefde8f575
jira bugs
5 years ago
Mirza.Shafique
f7b1e7f573
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza
5 years ago
haroon amjad
7b6270c67f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
bcb4f48785
build fix
5 years ago
Sultan khan
f048f5229b
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!321
5 years ago
Sultan khan
924f9bedc0
Merge branch 'bug_fixing' into 'development'
...
Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!319
5 years ago
Sultan khan
10f8ee5e81
Merge branch 'bug_fix_mirza' into 'development'
...
Bug Fix: 873, 878 to 881
See merge request Cloud_Solution/diplomatic-quarter!320
5 years ago
Mirza.Shafique
0bd5c8e649
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza
5 years ago
Sultan Khan
33465b04e5
permission
5 years ago
Mirza.Shafique
58d5734f1a
Bug Fix: 873, 878 to 881
5 years ago
Sultan Khan
d5d48703f9
camera permission fixed
5 years ago
Sultan Khan
85e803651c
permission issue fixed
5 years ago
Sikander Saleem
38f134b6ff
Bug PAP-884 fixed, email was not updating.
5 years ago
Sultan Khan
b4a7235fc8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
446021eb90
adding doctor list to health calculator
5 years ago
hussam al-habibeh
854352d9ce
jira bugs
5 years ago
Sikander Saleem
d0c8c4f017
Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen.
5 years ago
Sikander Saleem
b2e9060c3f
Bug PAP-877 fixed, blood tracker exception.
5 years ago
Mohammad Aljammal
07d603e52c
Merge branch 'bug_fixing' into 'development'
...
H2O Bug fixing
See merge request Cloud_Solution/diplomatic-quarter!317
5 years ago
Elham Rababh
2e1c9780d7
PAP-610: prevent show send email button if user have no vaccine
5 years ago
Elham Rababh
c6a68083a4
PAP-667: fix blood type
5 years ago
Elham Rababh
c14adccb49
PAP-667: add unit to home page
5 years ago
Elham Rababh
dd1dff01d6
PAP-790: fix Alignment of mobile number
5 years ago
Elham Rababh
4217fc0826
PAP-685: fix issue
5 years ago
Sikander Saleem
3128810fb0
improvements.
5 years ago
Sikander Saleem
b7fbee3252
improvements
5 years ago
Sikander Saleem
d6566d4abf
PAP-678 fixed, month & days in axis are aligned now.
5 years ago
Sikander Saleem
1f01f40ad8
PAP-681 fixed, H2O Unit changing & reflection.
5 years ago
Sikander Saleem
e41040b1b9
PAP-675 fixed, H2O Week chart vales from -1 to 1.
5 years ago
Sikander Saleem
7771b8f320
PAP-886 fixed, Insurance image button added.
5 years ago
Sikander Saleem
db84090694
PAP-872 & PAP-593 fixed, Water addition was not visible.
5 years ago
Sultan Khan
da2df9b348
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
bcabd81f88
BUG FIXES
5 years ago
Haroon Amjad
e13a13189c
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
81ce399e85
Merge branch 'fix-bugs' into 'development'
...
fix bugs
See merge request Cloud_Solution/diplomatic-quarter!316
5 years ago
mosazaid
865afd7761
fix bugs
5 years ago
Mohammad Aljammal
234e69c02d
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!315
5 years ago
hussam al-habibeh
bb6e7e931b
pharmacy-bugs
5 years ago
Mohammad Aljammal
b37dd57804
Merge branch 'pharmacy-Fatima' into 'development'
...
fixed prescription issue
See merge request Cloud_Solution/diplomatic-quarter!313
5 years ago
Mohammad Aljammal
25d5105caf
Merge branch 'Apr-fixes' into 'development'
...
PAP-607: fix issue
See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Fatimah Alshammari
b98d8b3a46
fixed prescription issue
5 years ago
Elham Rababah
2a47564c37
PAP-607: fix issue
5 years ago
Mohammad Aljammal
268f0c8fa4
Merge branch 'fix-bugs' into 'development'
...
fix-design
See merge request Cloud_Solution/diplomatic-quarter!311
5 years ago
Mohammad Aljammal
bd451f1283
Merge branch 'Apr-fixes' into 'development'
...
Apr fixes
See merge request Cloud_Solution/diplomatic-quarter!310
5 years ago
Mohammad Aljammal
50f84f318a
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!309
5 years ago
mosazaid
116a4af845
fix-design
5 years ago
Elham Rababah
36d422c7aa
PAP-563: fix pickup location from hospital
5 years ago
Elham Rababah
aa1c92c142
PAP-562: fix status
5 years ago
hussam al-habibeh
14939d3513
jira bugs (Health Calculator)
5 years ago
Elham Rababah
8c5b3742b6
PAP-643: fix button
5 years ago
Elham Rababah
aab33b3e03
PAP-609: fix text align
5 years ago
Fatimah Alshammari
174e0d9673
Merge branch 'development' into pharmacy-Fatima
5 years ago
Fatimah Alshammari
2481e4c9ea
fixed categories issues and home page button
5 years ago
Elham Rababah
1f70d086e0
PAP-634: Add search button.
5 years ago
Elham Rababah
9588b134fb
PAP-645: resized calculator
5 years ago
Mohammad Aljammal
f4f4a0977e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!307
5 years ago
Fatimah Alshammari
ef53338971
Merge branch 'development' into pharmacy-Fatima
5 years ago
Fatimah Alshammari
faa8a13778
fixed isuue-product details
5 years ago
Sultan Khan
9adc4a974c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
8c9c309abb
bug fixes
5 years ago
Mohammad Aljammal
1607aecb4a
Merge branch 'pharmacy-Fatima' into 'development'
...
fixed an issue in recommended page
See merge request Cloud_Solution/diplomatic-quarter!304
5 years ago
Mohammad Aljammal
bfc687d161
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!305
5 years ago
Sultan Khan
3a8b889b74
bug fixes
5 years ago
Sultan Khan
724e0098fb
bug fixes
5 years ago
Sultan Khan
1cd4d93488
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
cd7845b1a4
bug fix
5 years ago
Fatimah Alshammari
265d13b970
fixed an issue in recommended page
5 years ago
Mohammad Aljammal
2a484ec857
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Huawei Location Implementation -> LocationUtils.getCurrentLocation((coordinates){})
See merge request Cloud_Solution/diplomatic-quarter!302
5 years ago
Zohaib Iqbal Kambrani
c7c96f913f
no message
5 years ago
haroon amjad
6b675acc94
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad
353a5157f2
fixes
5 years ago
Mohammad Aljammal
e04421079e
Merge branch 'fix_bugs_Mar' into 'development'
...
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Sultan Khan
0245875358
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
3d6858d0ec
bug fixes
5 years ago
Elham Rababah
96117fd191
PAP-625: add option “not classified”.
5 years ago
Elham Rababah
6e7f62ca21
PAP-612: show ok and cancel options
5 years ago
Mohammad Aljammal
6fa79ef8d0
Merge branch 'pharmacy-bugs' into 'development'
...
jira bug PAP-530
See merge request Cloud_Solution/diplomatic-quarter!300
5 years ago
Elham Rababah
66a9239698
PAP-558: Remove the choose Drop-off
5 years ago
Elham Rababah
1b393d6601
PAP-559: remove the km
5 years ago
Elham Rababah
5dd2e9986e
PAP-559: fix hospital_service
5 years ago
hussam al-habibeh
1ce10f4d78
jira bug PAP-530
5 years ago
Mohammad Aljammal
0a4f17dc88
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!298
5 years ago
Mohammad Aljammal
dcc98a35ac
Merge branch 'fix_advance_payment' into 'development'
...
fix advance payment
See merge request Cloud_Solution/diplomatic-quarter!299
5 years ago
Mohammad Aljammal
9a850d0ca3
fix advance payment
5 years ago
haroon amjad
a6a9a92c6f
JIRA bug fixes
5 years ago
Fatimah Alshammari
bb622f248c
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari
235fdfba54
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
5 years ago
Fatimah Alshammari
71a393df68
fixed categories issue
5 years ago
haroon amjad
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad
49c454b132
fixes
5 years ago
Mohammad Aljammal
008a39f043
Merge branch 'fix_bugs_Mar' into 'development'
...
Fix bugs mar
See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Mohammad Aljammal
565dbf7c33
Merge branch 'sultan-patientapp' into 'development'
...
bug fix
See merge request Cloud_Solution/diplomatic-quarter!296
5 years ago
Sultan Khan
8e255f1f22
bug fix
5 years ago
Elham Rababah
86dda2b6d6
PAP-560: fix design
5 years ago
Elham Rababah
a1ecfbf16a
PAP-560: fix design
5 years ago
Elham Rababah
efb6ea68b8
PAP-561: fix design
5 years ago
Mohammad Aljammal
f2c5c93e2a
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!295
5 years ago
Sultan Khan
d4c3b03a5f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
1b770420be
bug fixes
5 years ago
Elham Rababah
2e035e2c6b
PAP-576: fix design
5 years ago
Elham Rababah
fa23c607bd
Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar
5 years ago
Mohammad Aljammal
e5bcc5403a
Merge branch 'fix_bugs' into 'development'
...
Fix bugs
See merge request Cloud_Solution/diplomatic-quarter!294
5 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
5 years ago
Fatimah Alshammari
39daaa16a7
added buttens in categories page
5 years ago
Mohammad Aljammal
256ffd05ea
Merge branch 'fix_eye_balance' into 'development'
...
Fix eye balance
See merge request Cloud_Solution/diplomatic-quarter!293
5 years ago
Mohammad Aljammal
126fad61c0
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
...
Conflicts:
lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal
53e4dfa99d
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal
3468f847d3
Merge branch 'pharmacy-bugs' into 'development'
...
jira bugs
See merge request Cloud_Solution/diplomatic-quarter!291
5 years ago
Mohammad Aljammal
7c1fd8043b
fix chart and eye and balance
5 years ago
Elham Rababah
7bdf31000f
PAP-356: fix chart design
5 years ago
Zohaib Iqbal Kambrani
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
hussam al-habibeh
a6ec7326b2
jira bugs
5 years ago
hussam al-habibeh
f9b8191a5e
jira bugs
5 years ago
Zohaib Iqbal Kambrani
6f2c947687
Packages And offers..
5 years ago
haroon amjad
9c1fdf96f4
Merge branch 'development' into Haroon
5 years ago
haroon amjad
33e1bf8103
Jira fixes
5 years ago
Mohammad Aljammal
a613fe08e4
Merge branch 'fix_theme_issues' into 'development'
...
fix the line chart issues
See merge request Cloud_Solution/diplomatic-quarter!289
5 years ago
haroon amjad
accc39d972
jira bug fixes
5 years ago
Mohammad Aljammal
ced7761a32
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues
5 years ago
Mohammad Aljammal
b36e00d2a5
fix the line chart issues
5 years ago
Mohammad Aljammal
a018eab316
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!288
5 years ago
Sultan Khan
60b1688bb4
chatbot
5 years ago
Sultan Khan
9bfd725e4f
bug fixes
5 years ago
Sultan Khan
ca2a48e860
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0445011e53
bug fixes
5 years ago
Mohammad Aljammal
0574161ad3
Merge branch 'fix_theme_issues' into 'development'
...
fix theme issues
See merge request Cloud_Solution/diplomatic-quarter!287
5 years ago
Mohammad Aljammal
ad88f6de04
fix theme issues
5 years ago
haroon amjad
8d16d0a69d
Merge branch 'development' into Haroon
5 years ago
haroon amjad
12c4250654
home page ereferral fix
5 years ago
Mohammad Aljammal
7e37d6824e
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!285
5 years ago
Sultan Khan
35c940a209
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
80d96ba785
Privilege issue fixed
5 years ago
haroon amjad
573f5110f5
Merge branch 'development' into Haroon
5 years ago
haroon amjad
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
bf3ea4c3a9
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!284
5 years ago
Sultan Khan
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
66acce3b40
ancillary order pages added
5 years ago
haroon amjad
db0fcd51cc
pharmacy updates
5 years ago
haroon amjad
74671d2f25
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/order-preview-service.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
5 years ago
Mohammad Aljammal
17fa2b5e20
Merge branch 'fix_order_checkout_payment' into 'development'
...
Fix order checkout payment
See merge request Cloud_Solution/diplomatic-quarter!283
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
mosazaid
ed1626f8ee
Merge branch 'development' into fix_order_checkout_payment
5 years ago
mosazaid
74dd274502
working on pharmacy some fixes on cart page and request body
5 years ago
haroon amjad
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b9a12341d5
updates & fixes
5 years ago
Mohammad Aljammal
4dcb70d7eb
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
Mohammad Aljammal
a0a217acc5
Merge branch 'ed_online' into 'development'
...
Done Ed online
See merge request Cloud_Solution/diplomatic-quarter!281
5 years ago
hussam al-habibeh
a534b1415e
products filtering fix
5 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
5 years ago
Mohammad Aljammal
cacb6722b9
Merge branch 'pharmacy-bugs' into 'development'
...
daynimic listing
See merge request Cloud_Solution/diplomatic-quarter!279
5 years ago
hussam al-habibeh
b39e88d9c8
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
5 years ago
Mohammad Aljammal
95e8fdcacf
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!280
5 years ago
Sultan Khan
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b891c1bd80
theme issue
5 years ago
hussam al-habibeh
2723422bbf
daynimic listing
5 years ago
haroon amjad
798840ee2f
Merge branch 'development' into Haroon
5 years ago
Mohammad Aljammal
123b1de1a4
Merge branch 'pharmacy-bugs' into 'development'
...
hussam
See merge request Cloud_Solution/diplomatic-quarter!278
5 years ago
Mohammad Aljammal
50a45528d1
Merge branch 'pharmacy-bug-fixes' into 'development'
...
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
5 years ago
Mohammad Aljammal
4e47da0702
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!277
5 years ago
hussam al-habibeh
299a1bed25
hussam
5 years ago
hussam al-habibeh
790fbbcf6c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/pharmacy_categorise.dart
5 years ago
hussam al-habibeh
3af37a6a5c
hussam
5 years ago
Fatimah Alshammari
8624d695dc
fixed order details
5 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
haroon amjad
44b041d499
Merge branch 'development' into Haroon
5 years ago
haroon amjad
5fb92c7816
covid drive-thru
5 years ago
mosazaid
44287db553
bug-fixes
5 years ago
Mohammad Aljammal
576181a72e
Merge branch 'sultan-patientapp' into 'development'
...
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!251
5 years ago
Sultan Khan
6f68cf5a15
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
ee231ed981
Merge branch 'pharmacy-payment-feature' into 'development'
...
Pharmacy payment feature
See merge request Cloud_Solution/diplomatic-quarter!275
5 years ago
Fatimah Alshammari
a46dddea9a
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
mosazaid
dfeb70c892
Merge branch 'development' into pharmacy-payment-feature
...
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
mosazaid
0b2002d4dd
finish payment order
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e61c26b853
Auto SMS, Themes, Voice Command
5 years ago
Fatimah Alshammari
c629fcb85c
fixed recommended products new design
5 years ago
Mohammad Aljammal
6b1cdb56c6
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!274
5 years ago
haroon amjad
da3ad90ddd
added app-wide route transition animation
5 years ago
Fatimah Alshammari
e5829d8513
fix recommended for you
5 years ago
haroon amjad
d8e11f7187
Merge branch 'development' into Haroon
5 years ago
haroon amjad
deb0b40cfe
fixes
5 years ago
Mohammad Aljammal
9dc00b2329
Merge branch 'pharmacy-payment-feature' into 'development'
...
Pharmacy payment feature
See merge request Cloud_Solution/diplomatic-quarter!273
5 years ago
mosazaid
c64769e422
Merge branch 'development' into pharmacy-payment-feature
5 years ago
mosazaid
f3cdd08857
adding fharmacy payment feature
5 years ago
enadhilal
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal
0c6fb67718
fixed issues
5 years ago
Fatimah Alshammari
42bf76f712
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
5 years ago
Zohaib Iqbal Kambrani
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
5 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
5 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
5 years ago
Mohammad Aljammal
d84d60dc56
Merge branch 'pharmacy-bugs' into 'development'
...
pharmacy bugs fixed
See merge request Cloud_Solution/diplomatic-quarter!272
5 years ago
Zohaib Iqbal Kambrani
516df96e21
no message
5 years ago
hussam al-habibeh
e050f87a64
pharmacy bugs
5 years ago
hussam al-habibeh
8c58dced7d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
5 years ago
hussam al-habibeh
1b76d9c192
pharmacy bugs fixed
5 years ago
Mohammad Aljammal
a211248cfa
Merge branch 'fix-pharmacy' into 'development'
...
Fix pharmacy
See merge request Cloud_Solution/diplomatic-quarter!271
5 years ago
mosazaid
125dd27a00
Merge branch 'development' into fix-pharmacy
5 years ago
mosazaid
5d0a122689
fix bugs
5 years ago
Mohammad Aljammal
30d525791d
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!268
5 years ago
Mohammad Aljammal
e6da54c201
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
2ec9331d2f
Merge branch 'fix-pharmacy' into 'development'
...
Fix pharmacy
See merge request Cloud_Solution/diplomatic-quarter!269
5 years ago
Mohammad Aljammal
20ad10b9dc
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
b9d043fd7c
Merge branch 'prescription_delivery' into 'development'
...
Done Prescription Delivery Address
See merge request Cloud_Solution/diplomatic-quarter!270
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
mosazaid
d02b74142a
Merge branch 'development' into fix-pharmacy
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
5 years ago
mosazaid
1a45f99606
some fixes on pharmacy
5 years ago
haroon amjad
5e8e3806d6
Covid Drive-Thru implemented
5 years ago
Sultan Khan
3e947dda37
Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
e20eed2f6e
voice command changes merged
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
haroon amjad
ba10014b46
Merge branch 'development' into Haroon
5 years ago
enadhilal
60648d368f
Merge branch 'development' into enad_pharmacy2
5 years ago
enadhilal
830e871e2c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
Mohammad Aljammal
4d950d3933
Merge branch 'prescription_delivery' into 'development'
...
Fix the Authentication Pharmacy
See merge request Cloud_Solution/diplomatic-quarter!267
5 years ago
Mohammad Aljammal
0632af3fb5
Fix the Authentication Pharmacy
5 years ago
Mohammad Aljammal
b8ded38dc2
Merge branch 'prescription_delivery' into 'development'
...
add Prescription Delivery Address Page and fix the Authentication Pharmacy
See merge request Cloud_Solution/diplomatic-quarter!266
5 years ago
Mohammad Aljammal
0098345d05
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
5 years ago
haroon amjad
83cca264f1
Merge branch 'LamaHerbish' into Haroon
5 years ago
HMG\Lama.Herbish
031be1ac56
fixes
5 years ago
haroon amjad
0dc35f1270
Merge branch 'development' into Haroon
5 years ago
Mohammad Aljammal
2ed1d244d8
Merge branch 'fix-pharmacy' into 'development'
...
fix pharmacy auth
See merge request Cloud_Solution/diplomatic-quarter!265
5 years ago
mosazaid
b70c7d7d05
fix pharmacy auth
5 years ago
enadhilal
292e983614
fixing issues
5 years ago
enadhilal
de4af313fa
Merge branch 'development' into enad_pharmacy2
5 years ago
enadhilal
57e9599f78
Merge branch 'development' into enad_pharmacy2
5 years ago
haroon amjad
f72c860516
Merge branch 'development' into Haroon
5 years ago
haroon amjad
60ea0465fd
fixes & updates
5 years ago
Mohammad Aljammal
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
5 years ago
haroon amjad
13f6015cf0
Merge branch 'development' into Haroon
5 years ago
haroon amjad
69649ff7f8
added verified icon in homepage when patient is logged in
5 years ago
Mohammad Aljammal
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
Mohammad Aljammal
ddea17a87c
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!263
5 years ago
haroon amjad
9ecf745747
fixes
5 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Fatimah Alshammari
ef8312f2b8
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
5 years ago
Fatimah Alshammari
ce64da11e4
homepage and product details design
5 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
94ee969406
hhc msg translation
5 years ago
Elham Rababah
8a1924cca2
fix images in hhc
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
9fca52efca
voice command
5 years ago
Sultan Khan
eeb073fb17
voice command
5 years ago
Mohammad Aljammal
e964afd4f2
Merge branch 'fix_security_issue' into 'development'
...
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
5 years ago
Mohammad Aljammal
d477481856
fix security issues in pharmacy
5 years ago
Mohammad Aljammal
63657cb7c4
Merge branch 'h2o_improvement' into 'development'
...
H2O feature, setting page added
See merge request Cloud_Solution/diplomatic-quarter!260
5 years ago
Sikander Saleem
e40ad85d61
H2O feature, setting page added
5 years ago
Mohammad Aljammal
1d724a8db6
Merge branch 'h2o_improvement' into 'development'
...
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
5 years ago
Sikander Saleem
bd062150c1
H2O feature improvement
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
haroon amjad
0b83089b86
Merge branch 'development' into Haroon
5 years ago
haroon amjad
3832cee1ad
Translation fixes
5 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
5 years ago
Mohammad Aljammal
ca82024f9e
Merge branch 'fix_pharmacy' into 'development'
...
Fix pharmacy
See merge request Cloud_Solution/diplomatic-quarter!258
5 years ago
Mohammad Aljammal
bb42647c91
Merge branch 'development' into 'fix_pharmacy'
...
# Conflicts:
# lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
f1f28f5ed0
Merge branch 'fix_login_design' into 'development'
...
fix colors issues
See merge request Cloud_Solution/diplomatic-quarter!257
5 years ago
Mohammad Aljammal
ab53ca82b1
fix colors issues
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
5 years ago
haroon amjad
3bad0a3804
Merge branch 'development' into Haroon
5 years ago
haroon amjad
146019432a
LiveCare schedule implemented
5 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
5 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0213264b7f
bug fixes
5 years ago
Mohammad Aljammal
9ed8f2365d
fix barcode issues
5 years ago
Mohammad Aljammal
8eda45d637
Merge branch 'my_tracker' into 'development'
...
fix bottom nav bar
See merge request Cloud_Solution/diplomatic-quarter!255
5 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
5 years ago
Mohammad Aljammal
76b2342ad8
Merge branch 'my_tracker' into 'development'
...
My tracker
See merge request Cloud_Solution/diplomatic-quarter!254
5 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
484cca086e
fix my my Trackers
5 years ago
Mohammad Aljammal
f0ee9db952
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!253
5 years ago
haroon amjad
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
5 years ago
Mohammad Aljammal
f6fd7587f2
Merge branch 'health-converter' into 'development'
...
health-converter fix
See merge request Cloud_Solution/diplomatic-quarter!252
5 years ago
hussam al-habibeh
b767748315
health-converter fix
5 years ago
hussam al-habibeh
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
1ce0ef7b6c
health-converter fix
5 years ago
haroon amjad
dde10cd27b
working in LiveCare Scheduling
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
Mohammad Aljammal
bd5e1ecd50
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!250
5 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
5 years ago
Sultan Khan
68f7a9ff9c
login chnages
5 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
5 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
5 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Mohammad Aljammal
f06a274ef6
Merge branch 'my_tracker' into 'development'
...
My tracker
See merge request Cloud_Solution/diplomatic-quarter!248
5 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
5 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Mohammad Aljammal
535f8876f6
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
HMGInternet & Geofence Merge into Development branch
See merge request Cloud_Solution/diplomatic-quarter!238
5 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
b9022be8c1
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!246
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Sultan Khan
86cf9300e1
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter : (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
5 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
5 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
5 years ago
Mohammad Aljammal
8d39e8b385
Merge branch 'fix_er' into 'development'
...
Fix ER service
See merge request Cloud_Solution/diplomatic-quarter!244
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Mohammad Aljammal
cf59057836
Merge branch 'fix_hhc_cmc' into 'development'
...
Fix hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!243
5 years ago
Elham Rababah
4ecce79258
first step from fix CMC
5 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
Mohammad Aljammal
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
5 years ago
Mohammad Aljammal
80fdebc34d
Merge branch 'design_issues' into 'development'
...
return CMC HHC
See merge request Cloud_Solution/diplomatic-quarter!242
5 years ago
Mohammad Aljammal
b63025a9b3
return CMC HHC
5 years ago
mosazaid
ff85b2f1b2
Merge branch 'development' into fix_design
5 years ago
mosazaid
5bcc67b77d
Nearest Er fix design
5 years ago
Mohammad Aljammal
8f499578d5
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!240
5 years ago
mosazaid
01bfe84644
solving NearestEr design problem
5 years ago
mosazaid
e71a56ed51
Merge branch 'development' into fix_design
5 years ago
mosazaid
d2e1a323ce
simple fix
5 years ago
Zohaib Iqbal Kambrani
e2bce87e34
resolve merge conflicts.
5 years ago
Mohammad Aljammal
013e3b0f1c
Merge branch 'design_issues' into 'development'
...
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!239
5 years ago
Mohammad Aljammal
30ddea6419
hot fixing
5 years ago
Zohaib Iqbal Kambrani
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
ed729689a9
Merge branch 'design_issues' into 'development'
...
fix design issues
See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
Fatimah Alshammari
a1b2709ac8
fixed orders
5 years ago
enadhilal
b8229fa8cd
Merge branch 'development' into enad_pharmacy2
5 years ago
Fatimah Alshammari
ba4003cb56
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
5 years ago
Mohammad Aljammal
b01e718ae3
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!235
5 years ago
mosazaid
2843b1393e
some design enhancments
5 years ago
Mohammad Aljammal
72290f041f
fix design
5 years ago
Mohammad Aljammal
975371a7fa
Merge branch 'development' into 'master'
...
Development
See merge request Cloud_Solution/diplomatic-quarter!234
5 years ago
Mohammad Aljammal
5f788b556f
Merge branch 'fix_android' into 'development'
...
fix android
See merge request Cloud_Solution/diplomatic-quarter!233
5 years ago
Mohammad Aljammal
1f03919094
fix android
5 years ago
Mohammad Aljammal
05af339fed
Merge branch 'master' into 'development'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!232
5 years ago
Mohammad Aljammal
58c2401079
Merge branch 'pharmacy_merge' into 'master'
...
Pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!231
5 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
5 years ago
Mohammad Aljammal
3fb522e15f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
be1a2d4180
Merge branch 'master' into 'development'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!230
5 years ago
Mohammad Aljammal
fa38d55c05
Merge branch 'change_color' into 'master'
...
change color
See merge request Cloud_Solution/diplomatic-quarter!229
5 years ago
Mohammad Aljammal
e61e02742c
Merge branch 'fatima_merge' into 'pharmacy'
...
Fatima merge
See merge request Cloud_Solution/diplomatic-quarter!228
5 years ago
Mohammad Aljammal
c82f01cd1a
fix merge issues
5 years ago
Mohammad Aljammal
16d1f667d4
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
7dd72d1324
Merge branch 'pharmacy_mosa_branch' into 'pharmacy'
...
Pharmacy mosa branch
See merge request Cloud_Solution/diplomatic-quarter!176
5 years ago
mosazaid
d77a607b78
commit
5 years ago
mosazaid
38d58ebaaf
Merge branch 'pharmacy' into pharmacy_mosa_branch
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
b03b73ec26
Merge branch 'enad_pharmacy_merge' into 'pharmacy'
...
Enad pharmacy merge
See merge request Cloud_Solution/diplomatic-quarter!227
5 years ago
Mohammad Aljammal
a2e5b48915
fix merge issues
5 years ago
Mohammad Aljammal
6827efc1b6
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy_merge
5 years ago
Mohammad Aljammal
d7fe93b3f3
Merge branch 'pharmacy-hussam' into 'pharmacy'
...
parent_categorise_page update
See merge request Cloud_Solution/diplomatic-quarter!226
5 years ago
Mohammad Aljammal
298b4d6525
change color
5 years ago
Mohammad Aljammal
71417da030
Merge branch 'merge_dq_master' into 'master'
...
Merge dq master
See merge request Cloud_Solution/diplomatic-quarter!224
5 years ago
Mohammad Aljammal
1968eb4682
return privilege
5 years ago
Mohammad Aljammal
952e106531
return privilege
5 years ago
Mohammad Aljammal
f77d2b497e
fix issues
5 years ago
Mohammad Aljammal
18dad434a0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
...
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
5 years ago
enadhilal
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal
4f59bd38df
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!223
5 years ago
Mohammad Aljammal
6bda03e935
hot fixing
5 years ago
Mohammad Aljammal
0f3de39aba
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
dashboard issue fixed
See merge request Cloud_Solution/diplomatic-quarter!222
5 years ago
Sultan Khan
e6a94f8014
login design
5 years ago
Sultan Khan
b992978af4
login
5 years ago
Sultan Khan
764e706000
dashboard issue fixed
5 years ago
Mohammad Aljammal
8ac3bc71dc
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!221
5 years ago
Sultan Khan
c01246acf0
hot fix
5 years ago
Sultan Khan
2b48578e07
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
016dffcb87
change
5 years ago
Mohammad Aljammal
6ffaa85864
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
fix last vital sign data
See merge request Cloud_Solution/diplomatic-quarter!220
5 years ago
Mohammad Aljammal
4263672f00
fim last vital sign data
5 years ago
Mohammad Aljammal
80da19555c
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!218
5 years ago
Mohammad Aljammal
519a474d41
fix live care label and vital sign data
5 years ago
Fatimah Alshammari
c0920e7099
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari
5fa5e9b7c8
fixed orders and profile
5 years ago
Mohammad Aljammal
5e3f6363cf
fix issues
5 years ago
Mohammad Aljammal
85a8bdf55b
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!217
5 years ago
Mohammad Aljammal
754e60eb72
fix send email lab result
5 years ago
Sultan Khan
6b4bae7370
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
827768e96d
language change
5 years ago
Mohammad Aljammal
eb459010a9
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
change the info images
See merge request Cloud_Solution/diplomatic-quarter!216
5 years ago
Mohammad Aljammal
591d56e624
change the info images and change the out patient color
5 years ago
Zohaib Kambrani
f03adb37ce
no message
5 years ago
Mohammad Aljammal
5c8e43c163
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
2553b032dd
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!215
5 years ago
Sultan Khan
8becd4f920
login issue fixed
5 years ago
Sultan Khan
3edae19ad6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
c9538c6a84
family files
5 years ago
Zohaib Kambrani
57925e3b02
Geofence fixes by JobScheduler
5 years ago
Mohammad Aljammal
33c61afd2a
add powered by
5 years ago
Mohammad Aljammal
4204abdddc
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
fix issues insurance and medical profile order
See merge request Cloud_Solution/diplomatic-quarter!214
5 years ago
Mohammad Aljammal
5e29dff448
fix issues insurance and medical profile order
5 years ago
Mohammad Aljammal
50b5886b9f
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!213
5 years ago
Sultan Khan
355286768a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
73c8e00852
bug fixes
5 years ago
Mohammad Aljammal
493c62cd99
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!212
5 years ago
Haroon Amjad
b0ea1fc262
updates & fixes
5 years ago
Mohammad Aljammal
b326b0324e
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!211
5 years ago
Sultan Khan
18f492e52f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
d53031b0e6
blood type update for family files
5 years ago
Mohammad Aljammal
bffafa65d1
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!210
5 years ago
Mohammad Aljammal
b9958acd53
fix issues
5 years ago
Mohammad Aljammal
2059b76fc1
fix Medical profile
5 years ago
Mohammad Aljammal
2d9ade7a5e
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!209
5 years ago
Mohammad Aljammal
4d8f42b517
fix issues vital sign issue
5 years ago
Mohammad Aljammal
4f015a1cda
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
f6983c138a
fix issues
5 years ago
Mohammad Aljammal
f850678fb6
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!208
5 years ago
Sultan Khan
37ab778fd0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
b505ed1be7
blood type added
5 years ago
Zohaib Kambrani
3392a2431b
Added Location Provider Changed Receiver to Reregister the geofences
5 years ago
Zohaib Kambrani
187d2bcd8b
Geofence error logging in shared_preferences
5 years ago
Zohaib Kambrani
a11d93332d
Wifi check network available - android
...
tweaking at geofence code
5 years ago
Mohammad Aljammal
7cd8e1ff40
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!207
5 years ago
Mohammad Aljammal
09a85d9127
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
adfeabb411
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!205
5 years ago
Mohammad Aljammal
9c12e949e8
hot fixes
5 years ago
Fatimah Alshammari
e5bf7acc52
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
...
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari
fda101840a
fixed order isuues
5 years ago
Zohaib Kambrani
4c00f9b3f2
Merge branch 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ZohaibIqbalKambrani
...
* 'ZohaibIqbalKambrani' of https://gitlab.com/Cloud_Solution/diplomatic-quarter :
geofencing login check fix
5 years ago
Zohaib Kambrani
7b4a2b9e64
no message
5 years ago
Zohaib Kambrani
508bc191be
geofencing login check fix
5 years ago
Sultan Khan
6b1e7587a8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
a0baaac314
bug fixes
5 years ago
Zohaib Kambrani
d8bd7d145d
no message
5 years ago
Mohammad Aljammal
aa0d6e206e
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
...
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!204
5 years ago
Mohammad Aljammal
a8b0af9ee1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
5 years ago
Mohammad Aljammal
d555634e28
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!203
5 years ago
Mohammad Aljammal
9c18c69d90
hot fixes
5 years ago
haroon amjad
53282e3ae6
ToDo back issue fixed
5 years ago
haroon amjad
ac3bebd59e
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
8c9762c24f
Fixes
5 years ago
Mohammad Aljammal
51f7833f50
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!202
5 years ago
Sultan Khan
073e79c325
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
040c8f38ab
hot fixes
5 years ago
Mohammad Aljammal
f303235ddd
Merge branch 'merge_dq_and_master' into 'master'
...
Merge dq and master
See merge request Cloud_Solution/diplomatic-quarter!200
5 years ago
Mohammad Aljammal
7bc8fdb819
fix merge issues
5 years ago
Mohammad Aljammal
3c2af11084
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
...
Conflicts:
lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal
f87bcfe064
Merge branch 'ZohaibIqbalKambrani' into 'master'
...
Geofence Android Finished
See merge request Cloud_Solution/diplomatic-quarter!201
5 years ago
Zohaib Kambrani
d8996cf879
Geofence Android Finished
5 years ago
Mohammad Aljammal
d28870a629
fix merge issues
5 years ago
Mohammad Aljammal
6d7cb1b970
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
...
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
a45216b902
hot fixes
5 years ago
Mohammad Aljammal
f13d21c5b1
Merge branch 'ZohaibIqbalKambrani' into 'master'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!198
5 years ago
Mohammad Aljammal
a57d5eb69f
hot fixes
5 years ago
mosazaid
0237d71931
make firebase-in app messaging commented to solve problem Duplicate class com.google.protobuf.WireFormat$Utf8Validation$3 found in modules jetified-protobuf-javalite-3.11.0.jar (com.google.protobuf:protobuf-javalite:3.11.0) and jetified-protobuf-lite-3.0.1.jar (com.google.protobuf:protobuf-lite:3.0.1)
5 years ago
Zohaib Kambrani
0f64c45e67
no message
5 years ago
Mohammad Aljammal
d9a70e7f75
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
hot fixes
See merge request Cloud_Solution/diplomatic-quarter!199
5 years ago
Mohammad Aljammal
8329c534a3
hot fixes
5 years ago
Mohammad Aljammal
4e2979cd64
fix merge issues
5 years ago
Mohammad Aljammal
7167d58ce2
fix merge issues
5 years ago
Mohammad Aljammal
aa89a05f1d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid
359eba2da0
make some updates in firebase version and update gradle, finish review order
5 years ago
Zohaib Kambrani
1dc9400ffc
Geofencing work in progress on android
5 years ago
Mohammad Aljammal
9b67b2632b
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!196
5 years ago
Sultan Khan
e312671e24
hot fixes
5 years ago
Sultan Khan
cf642da661
landing page
5 years ago
Mohammad Aljammal
d8134240de
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!195
5 years ago
Sultan Khan
eec67ac930
big fixes
5 years ago
Sultan Khan
99ee5b4545
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
ca1e496481
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
fix home issues
See merge request Cloud_Solution/diplomatic-quarter!192
5 years ago
Mohammad Aljammal
b29fdbb7d0
fix home issues
5 years ago
Sultan Khan
8a554aa2f8
auth services fixed
5 years ago
Mohammad Aljammal
530c9e89fc
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!191
5 years ago
Mohammad Aljammal
d9759560c3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
02d72fa27c
fix issues
5 years ago
Fatimah Alshammari
4a84483698
fixed order details
5 years ago
Mohammad Aljammal
2a2d149cc6
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!189
5 years ago
Sultan Khan
0f594059b5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
466b17949a
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!190
5 years ago
haroon amjad
a7dc2fdfd1
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
781fd1c287
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
9a578cafc2
bug fixes
5 years ago
Sultan Khan
b759758a68
bug fixes
5 years ago
Mohammad Aljammal
3860a08b53
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
fix issues
See merge request Cloud_Solution/diplomatic-quarter!188
5 years ago
Mohammad Aljammal
f38f53587b
fix issues
5 years ago
Haroon Amjad
3308aa47e1
fixes
5 years ago
Mohammad Aljammal
1c2f08a9fe
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
login loader issue fixed
See merge request Cloud_Solution/diplomatic-quarter!186
5 years ago
Sultan Khan
9e3db622fa
login loader issue fixed
5 years ago
Zohaib Kambrani
78928335ef
Geofences Login check (unregister/register geozones on logout/logout)
5 years ago
Zohaib Kambrani
6f6ab8d987
no message
5 years ago
Mohammad Aljammal
d5c5b7eaed
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!185
5 years ago
Mohammad Aljammal
3122f2438b
fix import dialog
5 years ago
Mohammad Aljammal
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
de1e352e98
fix charts and vital sign
5 years ago
Mohammad Aljammal
82724883fb
Merge branch 'ZohaibIqbalKambrani' into 'master'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!183
5 years ago
Mohammad Aljammal
fc00361db1
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!184
5 years ago
Zohaib Kambrani
53775d113d
commented code offers and packages
5 years ago
Zohaib Kambrani
9947b30d3f
fix merge conflict
5 years ago
Zohaib Kambrani
c534061c4f
no message
5 years ago
Zohaib Kambrani
9ea779e48a
no message
5 years ago
Zohaib Kambrani
b7088f70cd
Merge master in to my branch with Geofence iOS
5 years ago
haroon amjad
965c97d262
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
bf999e611b
my appointment fix
5 years ago
Mohammad Aljammal
7345a289ed
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!182
5 years ago
Sultan Khan
d779c6dd0a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
a2e385f282
family file drawer
5 years ago
Haroon Amjad
b9269f525a
hot fixes
5 years ago
Haroon Amjad
c67d41701d
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad
5606c88715
hot fixes
5 years ago
Mohammad Aljammal
621abe3ca2
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Add Confirm send email dialog
See merge request Cloud_Solution/diplomatic-quarter!181
5 years ago
Mohammad Aljammal
92e6275162
Add Confirm send email dialog
5 years ago
Haroon Amjad
81b51bef51
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
e35f706be3
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
fix chart and duplicated data in Patient Lab Result
See merge request Cloud_Solution/diplomatic-quarter!180
5 years ago
Mohammad Aljammal
4e823c2be4
fix chart and duplicated data in Patient Lab Result
5 years ago
haroon amjad
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Zohaib Kambrani
67f4b4e167
iOS Geofence in progress
5 years ago
Mohammad Aljammal
4a43bcefe1
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
remove ErOptions
See merge request Cloud_Solution/diplomatic-quarter!179
5 years ago
Mohammad Aljammal
a6d3fce6fc
remove ErOptions
5 years ago
Zohaib Kambrani
8457972fda
no message
5 years ago
haroon amjad
b13a56ffbd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
951d9b553f
fixes & updates
5 years ago
Mohammad Aljammal
87ae3f906c
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!178
5 years ago
Sultan Khan
71592adf32
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
1f0d01b6cc
language issue fixed
5 years ago
Sultan Khan
2c50402aa8
language issue fixed
5 years ago
haroon amjad
f394433b6e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
9d046fd971
updates & fixes
5 years ago
Mohammad Aljammal
9d76ee0154
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!177
5 years ago
Mohammad Aljammal
97776ce99b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
4a12ac4163
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!174
5 years ago
Mohammad Aljammal
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
5 years ago
Zohaib Kambrani
92ba977fca
no message
5 years ago
mosazaid
c058cf0e93
finish address add/edit/delete/select
5 years ago
Sultan Khan
557b8e814f
voice command
5 years ago
haroon amjad
75de755ccd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
6ac8d67b83
finish address add/edit/delete/select
5 years ago
Zohaib Kambrani
c10d024700
no message
5 years ago
Mohammad Aljammal
7bf181f3a6
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!175
5 years ago
Mohammad Aljammal
08aa2de69b
fix Prescriptions Service and design issues
5 years ago
Zohaib Kambrani
8d5d55a150
Geofencing in progress
5 years ago
Mohammad Aljammal
a2ec01be5d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
2f77592bac
fix Prescriptions Service and design issues
5 years ago
haroon amjad
740a294867
Translation & bug fixes
5 years ago
Mohammad Aljammal
62b923b25e
fix send rad report email
5 years ago
Mohammad Aljammal
5083080ba3
fix vital sign details
5 years ago
haroon amjad
1db5b15dcd
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
9ecaaa1b12
radiology fix in appointment details
5 years ago
Mohammad Aljammal
6fd405e9eb
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!173
5 years ago
Sultan Khan
e71c28472d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
9d9d77ee3a
bug fixes
5 years ago
Mohammad Aljammal
4705a79245
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!170
5 years ago
Sultan Khan
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
188b72bb90
voice command
5 years ago
Mohammad Aljammal
be586892d3
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!171
5 years ago
haroon amjad
d14e7e5223
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
e28209d4e8
bug fixes
5 years ago
Haroon Amjad
9d3c64200e
fixes
5 years ago
Mohammad Aljammal
9cec304712
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
5 years ago
Mohammad Aljammal
f9ac57e5b9
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
...
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!169
5 years ago
Mohammad Aljammal
eca2266f7b
hot fixing
5 years ago
Sultan Khan
21ccf1ef86
bug fixes
5 years ago
Sultan Khan
7742313923
voice command
5 years ago
Sultan Khan
ce7a64e86e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
hussam al-habibeh
e85b21c08f
parent_categorise_page update
5 years ago
haroon amjad
c4bb75eab4
Doctor rating fixed
5 years ago
haroon amjad
8d20762050
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
33956db22a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
5 years ago
haroon amjad
b55681a056
Working on steps tracking
5 years ago
Mohammad Aljammal
f7ee16f115
Merge branch 'privileges' into 'master'
...
Privileges
See merge request Cloud_Solution/diplomatic-quarter!167
5 years ago
Mohammad Aljammal
a1e92e1fdd
fix merge issue
5 years ago
Mohammad Aljammal
9dfd8a71dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
...
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal
9b8599a2cf
remove load user from SplashScreen
5 years ago
Mohammad Aljammal
735ed91f9c
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
...
fix LabResult
See merge request Cloud_Solution/diplomatic-quarter!166
5 years ago
Mohammad Aljammal
4d203c8a5b
fix LabResult
5 years ago
haroon amjad
8cd3ae915b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
468bb0356c
updates & fixes
5 years ago
Mohammad Aljammal
6ae2bfe790
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
...
remove updated button
See merge request Cloud_Solution/diplomatic-quarter!164
5 years ago
Mohammad Aljammal
14f92f6c58
remove updated button
5 years ago
Mohammad Aljammal
1b90ba54df
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
...
Fix insurance update
See merge request Cloud_Solution/diplomatic-quarter!163
5 years ago
Mohammad Aljammal
554ed1b50a
fix insurance update
5 years ago
Sultan Khan
7f44677242
voice command priv
5 years ago
Mohammad Aljammal
9fecf8e89f
fix insurance update
5 years ago
Mohammad Aljammal
935e72975c
add new privilege
5 years ago
haroon amjad
e495d3e5ad
Health Data integration implementing
5 years ago
Sultan Khan
a004610ac3
voice command updatd
5 years ago
Sultan Khan
124173c9c4
voice command updated
5 years ago
Sultan Khan
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
c050c3f189
voice command updated
5 years ago
Sultan Khan
f083912d43
voice command updated
5 years ago
enadhilal
727940c5c6
fixed merging issues
5 years ago
haroon amjad
cf6686e413
Merge branch 'master' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
378562b781
adding some changes in order pages like translate texts
5 years ago
enadhilal
9c55571072
Merge branch 'pharmacy' into enad_pharmacy2
5 years ago
enadhilal
c22ca4e29e
Merge branch 'pharmacy' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
5 years ago
haroon amjad
849723ffd3
Merge branch 'pharmacy-Fatima' into 'pharmacy'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!162
5 years ago
enadhilal
888a74fb9b
add these pages
...
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
5 years ago
Fatimah Alshammari
ed68eed9df
added links for profile
5 years ago
Mohammad Aljammal
03a81c7832
Merge branch 'merge_diplomatic_quarter_live_to_master' into 'master'
...
Merge diplomatic quarter live to master
See merge request Cloud_Solution/diplomatic-quarter!161
5 years ago
Mohammad Aljammal
2e2a29145c
fix merge issues
5 years ago
Mohammad Aljammal
459ba828d9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
Mohammad Aljammal
5f12eab870
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
added countdown timer in my appointments
See merge request Cloud_Solution/diplomatic-quarter!159
5 years ago
haroon amjad
59aba6608d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
5 years ago
haroon amjad
a1f91d99b3
added countdown timer in my appointments
5 years ago
Fatimah Alshammari
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal
c65477f7d9
Merge branch 'revert-133450e5' into 'master'
...
Revert "Merge branch 'pharmacy-hussam' into 'master'"
See merge request Cloud_Solution/diplomatic-quarter!158
5 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
5 years ago
Fatimah Alshammari
9b8103bfd6
fixe order and order details
5 years ago
Sultan Khan
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
496163a61a
voice command updated
5 years ago
Sultan Khan
83ac5b7031
voice command updated
5 years ago
Mohammad Aljammal
133450e503
Merge branch 'pharmacy-hussam' into 'master'
...
Pharmacy hussam
See merge request Cloud_Solution/diplomatic-quarter!149
5 years ago
Mohammad Aljammal
092f415457
Merge branch 'fix_issues' into 'diplomatic-quarter-live'
...
add missing translation
See merge request Cloud_Solution/diplomatic-quarter!157
5 years ago
Mohammad Aljammal
47e4b99f11
fix issues
5 years ago
Mohammad Aljammal
9e8def6584
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
7f23f356f1
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!151
5 years ago
Mohammad Aljammal
0bf47dcc76
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
See merge request Cloud_Solution/diplomatic-quarter!156
5 years ago
Mohammad Aljammal
4e2c955b09
add missing translation
5 years ago
haroon amjad
9575a236d4
Merge branch 'pharmacy-hussam' into 'pharmacy'
...
Pharmacy hussam
See merge request Cloud_Solution/diplomatic-quarter!155
5 years ago
haroon amjad
dfa1952f4d
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
5 years ago
hussam al-habibeh
5dc3c53550
mousa and hussam branch
5 years ago
hussam al-habibeh
a1906a4072
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
hussam al-habibeh
800565407d
12/6
5 years ago
mosazaid
4c9a1862d2
make pharmacy home page load data even without login, and some mini changes
5 years ago
haroon amjad
257dc3d76d
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
...
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
5 years ago
mosazaid
7ee7ef58c4
working on dynamic title on pharmacy
5 years ago
umasoodch
1f9d592268
removed access key code in pubspec
5 years ago
umasoodch
b5413d1749
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
umasoodch
9f0fd8f144
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy
5 years ago
mosazaid
709ba2ce97
create terms-condition in pharmacy order page
5 years ago
haroon amjad
a85ef855f5
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
...
commit
See merge request Cloud_Solution/diplomatic-quarter!153
5 years ago
mosazaid
2a91ae787f
commit
5 years ago
Sultan Khan
92b0b6d6ea
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
8b8207cb0d
search
5 years ago
Sultan Khan
68d88acd64
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
e34a5c3c13
multiple login calls fixed
5 years ago
Mohammad Aljammal
23d458f035
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!150
5 years ago
Sultan Khan
f5b7d35f23
bug fixes
5 years ago
Sultan Khan
ec3e8bf7d9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
4669252d1f
flutter tts
5 years ago
Sultan Khan
a3e01ff938
flutter tts
5 years ago
Sultan Khan
e3e868e47c
flutter tts updated
5 years ago
Sultan Khan
8c5746f7b1
bug fixes
5 years ago
Sultan Khan
8d7cc20b70
localized value updated
5 years ago
Sultan Khan
321d31b3bd
voice search page updated
5 years ago
Sultan Khan
d69b3676a4
weather indicator in progress
5 years ago
hussam al-habibeh
64cbae3602
Search
5 years ago
Mohammad Aljammal
1394ceed3c
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
...
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!147
5 years ago
Mohammad Aljammal
b8df3ef9e3
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!148
5 years ago
Sultan Khan
81c8239412
bug fixes
5 years ago
Sultan Khan
fc0117754d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
36b9d5cf7c
robot pages added
5 years ago
Mohammad Aljammal
efae246566
Merge branch 'images_info' into 'diplomatic-quarter-live'
...
Added info images description
See merge request Cloud_Solution/diplomatic-quarter!145
5 years ago
Mohammad Aljammal
1c23e28081
fix merge issues
5 years ago
Mohammad Aljammal
ced86de9fe
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
...
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
269f682bd5
Added info images description
5 years ago
Mohammad Aljammal
76a9b7b9e2
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!144
5 years ago
mosazaid
35d0d3e441
finsi lakum points task
5 years ago
haroon amjad
f1a8e09a59
Added info images description
5 years ago
haroon amjad
47b030eb82
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7edb0c8009
Doctor rating dialog revamped
5 years ago
Sultan Khan
3a055aa02b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
79c17de0de
ltr issue fixed
5 years ago
Mohammad Aljammal
5d72ff7670
Merge branch 'images_info' into 'diplomatic-quarter-live'
...
add images info
See merge request Cloud_Solution/diplomatic-quarter!143
5 years ago
Mohammad Aljammal
3daef6e53f
add images info
5 years ago
Mohammad Aljammal
dc898a799d
Add Privileges
5 years ago
Sultan Khan
3ab513d9d0
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
dbca686adf
Merge branch 'hhc_cmc' into 'master'
...
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!142
5 years ago
Sultan Khan
98f84c2161
voice search in progress
5 years ago
Elham Rababah
d9ffc5d3da
remove duplicated package
5 years ago
Elham Rababah
713e44cf8b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
ea195ea9bf
Finish translate CMC HHC
5 years ago
Sultan Khan
12d5ef69a9
voice search in progress
5 years ago
haroon amjad
ff0d66ccdb
Covid test translations
5 years ago
Mohammad Aljammal
bda6f58aa3
Merge branch 'Haroon' into 'master'
...
working on ereferral
See merge request Cloud_Solution/diplomatic-quarter!141
5 years ago
haroon amjad
4f1f7dcefd
ereferral implementation completed
5 years ago
haroon amjad
65fbd7af8e
referral finalised
5 years ago
Zohaib Kambrani
1155466d19
Packages and Offer Slider at home
5 years ago
mosazaid
98f660e29b
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid
951c77feb5
working on lakum account
5 years ago
mosazaid
4e5d6a9a00
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
5 years ago
Elham Rababah
5bf63174c9
First step from translations
5 years ago
haroon amjad
82e23efd32
working on ereferral
5 years ago
umasoodch
0431eb1ac8
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
Sultan Khan
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
2fb0ccfdbd
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
4b435199fc
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!139
5 years ago
haroon amjad
6846a8501a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
0181043da8
Ereferral fixes, smartwatch health data integration
5 years ago
Mohammad Aljammal
e42b437420
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!137
5 years ago
Mohammad Aljammal
2185f5ce11
Merge branch 'hhc_cmc' into 'master'
...
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Elham Rababah
1e1677a365
naming issue fix
5 years ago
Elham Rababah
05deaa6322
Address Added Successfully
5 years ago
Sultan Khan
078183c1fb
not authenticated page updated
5 years ago
Elham Rababah
68e4b92717
Address Added Successfully
5 years ago
Sultan Khan
de2a5e55eb
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
7d3c1ac852
weather indicator updated
5 years ago
Sultan Khan
648d9d245d
health weather indicator
5 years ago
Zohaib Kambrani
96afe340e7
Merge branch 'hmg_internet_fix' into ZohaibIqbalKambrani
...
* hmg_internet_fix:
Wifi internet
no message
5 years ago
Zohaib Kambrani
18f5203f56
Merge branch 'master' into ZohaibIqbalKambrani
...
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/my_balance_service.dart
# lib/core/service/medical/prescriptions_service.dart
# lib/core/viewModels/medical/my_balance_view_model.dart
# lib/core/viewModels/medical/prescriptions_view_model.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/advance_payment_page.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/pages/medical/prescriptions/prescription_items_page.dart
# lib/pages/settings/general_setting.dart
# lib/pages/settings/profile_setting.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/authentication/auth_provider.dart
# lib/services/permission/permission_service.dart
# lib/theme/theme_value.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/button.dart
# lib/widgets/buttons/defaultButton.dart
# lib/widgets/buttons/floatingActionButton.dart
# lib/widgets/buttons/mini_button.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/data_display/medical/LabResultWidget.dart
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/data_display/medical/laboratory_result_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
5 years ago
Zohaib Kambrani
55ad82147f
Wifi internet
5 years ago
Zohaib Kambrani
15918e2d62
no message
5 years ago
Zohaib Kambrani
27182ee8db
no message
5 years ago
Elham Rababah
ed56476d81
second step from location fixes
5 years ago
Mohammad Aljammal
1df9ed4a09
Merge branch 'child_vaccines' into 'master'
...
done child Vaccination
See merge request Cloud_Solution/diplomatic-quarter!136
5 years ago
Mohammad Aljammal
5fdb357a57
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!135
5 years ago
Mohammad Aljammal
54d8965773
done child Vaccination
5 years ago
haroon amjad
97b8aeeff5
Version Control finished
5 years ago
haroon amjad
a03d5c6d57
App initial release to stores
5 years ago
Sultan Khan
e7c862c801
health weather indicator
5 years ago
Sultan Khan
909401cc7e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
a9cb645833
health weather indicator
5 years ago
Sultan Khan
19d6057f66
health weather indicator
5 years ago
Elham Rababah
7aa7af6de7
finish CMC module
5 years ago
haroon amjad
92db2b2be9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Elham Rababah
fd80afeb5a
finish hhc module
5 years ago
Elham Rababah
3ef22be7da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/config.dart
5 years ago
Elham Rababah
a87855f445
Fix issues on hhc module
5 years ago
Mohammad Aljammal
3c54ed00f9
Merge branch 'child_vaccines' into 'master'
...
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!134
5 years ago
Mohammad Aljammal
49974f81db
add translations to child Vaccination
5 years ago
Mohammad Aljammal
8b38ce2267
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!133
5 years ago
Sultan Khan
5e6bcadec0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
603833db37
login changes
5 years ago
Sultan Khan
340b9770c8
login
5 years ago
haroon amjad
e5feef8a9d
Updates & UI Fixes
5 years ago
Sultan Khan
799fca346b
health weather indicator
5 years ago
Sultan Khan
8612ae91c4
sultan
5 years ago
Sultan Khan
0f80224016
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
fa01d132c7
merger DQ live and fix some issues on Child Vaccines
5 years ago
Mohammad Aljammal
a556e8c1f8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
5 years ago
haroon amjad
01512e6332
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
47c980a412
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
...
add Radiology translations and colors
See merge request Cloud_Solution/diplomatic-quarter!131
5 years ago
Mohammad Aljammal
482ec536de
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
...
Conflicts:
lib/config/config.dart
5 years ago
Mohammad Aljammal
b6d2878cf1
add Radiology translations and colors
5 years ago
Mohammad Aljammal
6cb3224226
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!129
5 years ago
haroon amjad
8400254020
Merge branch 'pharmacy-Fatima' into 'pharmacy'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!130
5 years ago
Fatimah Alshammari
d328c74fc4
fix order and orderdetails
5 years ago
Sultan Khan
22676fcbd1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
5bb780c4ac
push
5 years ago
haroon amjad
ebb8a8fa2c
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
d0891ba16b
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
...
fix lab result translations and colors
See merge request Cloud_Solution/diplomatic-quarter!128
5 years ago
Mohammad Aljammal
b504f379de
fix lab result translations and colors
5 years ago
Mohammad Aljammal
2731c5b1d4
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
5 years ago
Sultan Khan
d6a0188c76
fingerprint
5 years ago
Sultan Khan
7c33c06c0c
fingerprint
5 years ago
Sultan Khan
1b678e0aca
fingerprint
5 years ago
Sultan Khan
6a14214a0f
no message
5 years ago
Sultan Khan
24b7bca471
no message
5 years ago
haroon amjad
c74ac3b7ca
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
92b18bce07
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
...
fix vital Sign
See merge request Cloud_Solution/diplomatic-quarter!126
5 years ago
haroon amjad
720f82ea80
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
85062859c8
updates
5 years ago
Mohammad Aljammal
0ac599ea1c
fix vital Sign
5 years ago
Mohammad Aljammal
caf930050f
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!125
5 years ago
haroon amjad
10025103ac
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
21c7c94ef2
updates & fixes
5 years ago
Mohammad Aljammal
9fcf87126a
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!124
5 years ago
Sultan Khan
b61e734f80
feedback permission
5 years ago
Sultan Khan
6bbdf05f90
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
857fc813cd
button feedback
5 years ago
Mohammad Aljammal
51a03b83fa
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
advance payment & payment flow issues fixed
See merge request Cloud_Solution/diplomatic-quarter!123
5 years ago
Sultan Khan
29eaa26b36
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
571bda9100
permission
5 years ago
haroon amjad
d284ceac04
advance payment & payment flow issues fixed
5 years ago
Mohammad Aljammal
706cd13656
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!122
5 years ago
Sultan Khan
8429f83d7c
registration done
5 years ago
Sultan Khan
391e178484
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
8d499704dc
family file changes
5 years ago
Mohammad Aljammal
2cb37bf8a0
Merge branch 'fix_prescriptions' into 'diplomatic-quarter-live'
...
Fix prescriptions
See merge request Cloud_Solution/diplomatic-quarter!121
5 years ago
Mohammad Aljammal
91cada6901
fix Advance Payment
5 years ago
Mohammad Aljammal
dcbc0de69f
fix prescription
5 years ago
Mohammad Aljammal
4e31a79019
Merge branch 'fix_master' into 'master'
...
fix merge issues
See merge request Cloud_Solution/diplomatic-quarter!120
5 years ago
Mohammad Aljammal
f70ca95a38
fix merge issues
5 years ago
Mohammad Aljammal
85df92a0ca
Merge branch 'fix_master' into 'master'
...
Fix master
See merge request Cloud_Solution/diplomatic-quarter!119
5 years ago
Mohammad Aljammal
0d098def04
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
...
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal
eb5727ef8a
fix master
5 years ago
Mohammad Aljammal
776b20ff67
fix master
5 years ago
Mohammad Aljammal
939840bbe7
fix master
5 years ago
Mohammad Aljammal
67cc5e2033
fix Prescriptions
5 years ago
Mohammad Aljammal
221091c5f0
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!118
5 years ago
Sultan Khan
072e6cffef
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
2f454055b9
login fixed
5 years ago
Mohammad Aljammal
b7b740cccf
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!117
5 years ago
Sultan Khan
18a2393d92
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
6e152951b4
notification count
5 years ago
Mohammad Aljammal
0966269537
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Mohammad Aljammal
748d98610f
Merge branch 'fix_medicine_search' into 'diplomatic-quarter-live'
...
Fix medicine search
See merge request Cloud_Solution/diplomatic-quarter!113
5 years ago
Sultan Khan
d2f391ab7f
setting page inprogress
5 years ago
Sultan Khan
4c8c4e3725
setting page inprogress
5 years ago
Sultan Khan
0ed29be214
launch
5 years ago
Sultan Khan
00b0154987
my family
5 years ago
Mohammad Aljammal
3c1257b379
fix Medicine Search
5 years ago
Zohaib Kambrani
c2be303418
Move code from java to kotlin package
5 years ago
Zohaib Kambrani
3264b82118
Complete Native Wifi connection and LoadingView Android
5 years ago
Zohaib Kambrani
8fcf1b6708
Swipe the Native loading « arguments
5 years ago
Sultan Khan
30a8e24521
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
91be66ecdd
family file changes
5 years ago
Mohammad Aljammal
b785f87dac
fix App drawer after logout
5 years ago
Zohaib Kambrani
8e554970f3
Wifi Connectivity and loading View
5 years ago
Mohammad Aljammal
ddc7eca605
fix Insurance Cards
5 years ago
Mohammad Aljammal
e4cd33921d
Merge branch 'arabic_issues' into 'diplomatic-quarter-live'
...
lab result issues
See merge request Cloud_Solution/diplomatic-quarter!112
5 years ago
Mohammad Aljmma
6523a1dea9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljmma
501692587f
change the base Url
5 years ago
Mohammad Aljmma
a9b11a6b03
fix lab result
5 years ago
Sultan Khan
fdef34a394
viral sign issue
5 years ago
Zohaib Kambrani
69d1e4bb0b
no message
5 years ago
Sultan Khan
3589b21590
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljmma
770d28033d
fix issues#26 & 27 & 28
5 years ago
Mohammad Aljmma
ed7b9d609f
fix lab result
5 years ago
Mohammad Aljammal
f6d2246e90
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!111
5 years ago
haroon amjad
b81af62551
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b89c1f03b3
language translation fixes
5 years ago
Sultan Khan
431306f0e1
insurance details
5 years ago
Sultan Khan
1f4f81b454
insurance card details
5 years ago
Sultan Khan
bedafa24cd
insurance details
5 years ago
Sultan Khan
d81cc7119d
insurance details
5 years ago
Mohammad Aljmma
8f38dc6077
fix issue #24
5 years ago
Sultan Khan
a16145d7f1
bugfixes
5 years ago
Sultan Khan
0eedb788c3
register page
5 years ago
Sultan Khan
536682e953
merge
5 years ago
Sultan Khan
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
3fef1b9d52
theme and login issues fixed
5 years ago
Mohammad Aljammal
e4f768454d
Merge branch 'arabic_issues' into 'diplomatic-quarter-live'
...
Arabic issues
See merge request Cloud_Solution/diplomatic-quarter!110
5 years ago
Mohammad Aljmma
a1684bdd9e
fix issue #17 & 18
5 years ago
Mohammad Aljmma
e42ebfbf64
fix issue #16
5 years ago
Mohammad Aljmma
59defa4532
fix issue #15
5 years ago
Mohammad Aljmma
97a8fe4f9b
fix issue #14
5 years ago
Mohammad Aljmma
5e8b61bf2d
fix issue #13
5 years ago
Mohammad Aljmma
0f938fafd2
fix issue #12
5 years ago
Mohammad Aljmma
741126102d
fix issue #11
5 years ago
Mohammad Aljmma
fdeac4823e
fix issue #10
5 years ago
Mohammad Aljmma
179df475b4
fix issue #9
5 years ago
Mohammad Aljmma
20ece68ddb
fix issue # 6 & 7 & 8
5 years ago
Mohammad Aljmma
216c5609c6
fix issue # 6 & 7 & 8
5 years ago
Mohammad Aljmma
b913e5a7b7
fix issue#6
5 years ago
Mohammad Aljmma
7b55454fde
fix issue#5
5 years ago
Mohammad Aljmma
a742f896be
fix issue#4
5 years ago
Mohammad Aljmma
bfaacb2719
fix issue#3
5 years ago
Mohammad Aljmma
5b3a4e674d
fix issue#2
5 years ago
Mohammad Aljmma
27594f15b8
fix issue#1
5 years ago
Mohammad Aljammal
834c7ab92e
Merge branch 'prescriptions' into 'diplomatic-quarter-live'
...
fix Prescriptions history
See merge request Cloud_Solution/diplomatic-quarter!109
5 years ago
Mohammad Aljmma
e1f6ef5e5b
fix Prescriptions history
5 years ago
Sultan Khan
58b1f648c1
setting theme
5 years ago
hussam al-habibeh
69ea8b7bd7
daynmic products listing
5 years ago
Sultan Khan
283473a06a
theme changes
5 years ago
Sultan Khan
d1336eec8b
login type
5 years ago
Sultan Khan
c00391d3e5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
b35dbb6b42
Merge branch 'fix_authenticated_user_data' into 'diplomatic-quarter-live'
...
Fix authenticated user data
See merge request Cloud_Solution/diplomatic-quarter!108
5 years ago
haroon amjad
9096ccd4d4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljmma
d76b679a7f
fix issues
5 years ago
Mohammad Aljammal
6233adb6c2
Merge branch 'fix_authenticated_user_data' into 'diplomatic-quarter-live'
...
fix authenticated user data
See merge request Cloud_Solution/diplomatic-quarter!107
5 years ago
Mohammad Aljmma
6181e52ef1
fix authenticated user data
5 years ago
Sultan Khan
4b5ac8c853
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
f05b235cd0
login issue
5 years ago
haroon amjad
2e484d7535
QR Code loading issue resolved
5 years ago
Zohaib Kambrani
0c71fbad5f
no message
5 years ago
Mohammad Aljammal
75c8950498
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!106
5 years ago
Sultan Khan
cced69502a
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
2d7923afb4
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!105
5 years ago
haroon amjad
6062716209
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
10efccbce8
my appointment fixes
5 years ago
Sultan Khan
aec2ab75d0
settings update
5 years ago
Sultan Khan
aa8f9f18e1
forgot password
5 years ago
Fatimah Alshammari
ddf032bb47
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari
f137bd44c0
created order and order details UI pages
5 years ago
Mohammad Aljammal
0222b484b7
Merge branch 'my_family' into 'diplomatic-quarter-live'
...
My family
See merge request Cloud_Solution/diplomatic-quarter!104
5 years ago
Mohammad Aljmma
981020fce5
fix my family issues
5 years ago
Mohammad Aljmma
1111f26a9d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family
5 years ago
haroon amjad
94fb41581e
config update
5 years ago
haroon amjad
9868a43e7b
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
506e32e8c8
Payment issues resolved
5 years ago
haroon amjad
05ad8f8db5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Sultan Khan
4976870d2e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
875bf10c73
settings page added
5 years ago
Mohammad Aljammal
de3b76446a
Merge branch 'info_medical' into 'diplomatic-quarter-live'
...
add info for Medical
See merge request Cloud_Solution/diplomatic-quarter!103
5 years ago
Mohammad Aljmma
6a83538544
add info for Medical
5 years ago
Mohammad Aljammal
620f824b0a
Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
...
fix user authentication data
See merge request Cloud_Solution/diplomatic-quarter!102
5 years ago
Mohammad Aljmma
a077d87dd8
fix user authentication data
5 years ago
haroon amjad
ffbc7c4af4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal
332820885e
Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
...
Fix authentication
See merge request Cloud_Solution/diplomatic-quarter!101
5 years ago
Mohammad Aljmma
7d2f1cf318
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
5 years ago
Mohammad Aljmma
570aa514cd
fix user authentication data
5 years ago
haroon amjad
b7b7ead3ba
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
ee67852970
Bottom navbar count & ToDo list fixed
5 years ago
haroon amjad
f0897881d1
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
398bbe6f8d
Merge branch 'notifications_page' into 'diplomatic-quarter-live'
...
Notifications page
See merge request Cloud_Solution/diplomatic-quarter!99
5 years ago
haroon amjad
d75e5caf08
fixed appointment online checkIn issue
5 years ago
Elham Rababah
124d388ee1
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
...
Conflicts:
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
5 years ago
Mohammad Aljammal
625e40d7bf
Merge branch 'hot_login_fixing' into 'diplomatic-quarter-live'
...
fix status issue
See merge request Cloud_Solution/diplomatic-quarter!100
5 years ago
Mohammad Aljmma
4a4d5248a2
fix status issue
5 years ago
Elham Rababah
64f970c40c
Fix issues after the merge
5 years ago
haroon amjad
5020c24e8b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
5 years ago
Elham Rababah
5ed4d76a54
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
15a8e64e7c
updates & fixes
5 years ago
Elham Rababah
41b919183f
Fix bug on read notifications_page.dart
5 years ago
Mohammad Aljammal
6d30156f1a
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!98
5 years ago
Mohammad Aljmma
9880b0236b
fix my family issues
5 years ago
Sultan Khan
0443a37886
register page updated
5 years ago
Sultan Khan
b9b5797cbc
login issue fixed
5 years ago
haroon amjad
89022231d7
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
hussam al-habibeh
6162833bba
offers products page
5 years ago
hussam al-habibeh
7815005e21
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
hussam al-habibeh
69a6bc2812
offers page
5 years ago
Elham Rababah
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
5 years ago
Sultan Khan
d939b2ec9b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
f8e05fc447
regiter issue
5 years ago
Mohammad Aljammal
8baa3bd1a5
Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
...
fix lab result
See merge request Cloud_Solution/diplomatic-quarter!97
5 years ago
Mohammad Aljmma
747cffacfc
fix lab result
5 years ago
haroon amjad
4f53d058d4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
a691186ec7
Merge branch 'pharmacy_module_feature_home_page' into 'master'
...
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!96
5 years ago
mosazaid
2095f2c62a
fix merge issue
5 years ago
mosazaid
dade295656
fix merge issue
5 years ago
mosazaid
11ff27bae3
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
mosazaid
9a169ff77b
finish home page and start working on order preview page
5 years ago
Elham Rababah
9f2beceb22
First step from notifications_page
5 years ago
Mohammad Aljammal
f361793f39
Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
...
fix prescription report issues
See merge request Cloud_Solution/diplomatic-quarter!95
5 years ago
Mohammad Aljmma
e42f953bd1
fix prescription report issues
5 years ago
haroon amjad
ff3368eefb
Login check implemented for appointment & ToDo
5 years ago
Mohammad Aljammal
55e25fade8
Merge branch 'fix_login' into 'diplomatic-quarter-live'
...
Fix login
See merge request Cloud_Solution/diplomatic-quarter!94
5 years ago
Mohammad Aljmma
54a7f98eff
fix login issues
5 years ago
Mohammad Aljmma
a796e0392b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
...
Conflicts:
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
5 years ago
Mohammad Aljmma
f79d8eb8f9
fix login issues
5 years ago
Mohammad Aljammal
625025c079
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
fixed forgot password issue, Implemented new loader in login flow
See merge request Cloud_Solution/diplomatic-quarter!93
5 years ago
haroon amjad
af780bca76
registration fixes
5 years ago
enadhilal
778e9fd8da
Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
dbb53e7821
fixed forgot password issue, Implemented new loader in login flow
5 years ago
hussam al-habibeh
e74e168e88
Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
5 years ago
hussam al-habibeh
f7cee8f484
pharmacy module app && category home page
5 years ago
mosazaid
d1ac4080ca
working on pharmacy home page
5 years ago
Mohammad Aljammal
8fe17a5cad
Merge branch 'home_page' into 'diplomatic-quarter-live'
...
Home page
See merge request Cloud_Solution/diplomatic-quarter!91
5 years ago
Mohammad Aljmma
59d592778b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
5 years ago
Mohammad Aljmma
e7e32a414b
fix barcode
5 years ago
Mohammad Aljammal
1775766a08
Merge branch 'loader_fix' into 'diplomatic-quarter-live'
...
Fix loader issue.
See merge request Cloud_Solution/diplomatic-quarter!90
5 years ago
Elham Rababah
fa88e9055f
make loader center
5 years ago
Elham Rababah
042de21831
Fix loader issue.
5 years ago
Mohammad Aljammal
f3e64eaa6b
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!89
5 years ago
haroon amjad
aeab57beab
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
5 years ago
haroon amjad
f5a2870fac
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljammal
ffe85305b5
Merge branch 'home_page' into 'diplomatic-quarter-live'
...
Home page
See merge request Cloud_Solution/diplomatic-quarter!88
5 years ago
Mohammad Aljmma
479aea4df8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljmma
d4be20b07b
add icons
5 years ago
Mohammad Aljmma
e10a0a4d54
add splash page fix language issues
5 years ago
Mohammad Aljammal
0e11133ef1
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
New loading dialog added into appointment flow
See merge request Cloud_Solution/diplomatic-quarter!87
5 years ago
haroon amjad
1553e71e7d
New loading dialog added into appointment flow
5 years ago
umasoodch
23083fd5ad
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljmma
d5afb50ed3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
...
Conflicts:
lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljmma
856ab52439
fix ui issues
5 years ago
Mohammad Aljammal
f8d148c849
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
updates
See merge request Cloud_Solution/diplomatic-quarter!86
5 years ago
haroon amjad
6fd7a3fa3d
updates
5 years ago
Mohammad Aljammal
dd361cd883
Merge branch 'home_page' into 'diplomatic-quarter-live'
...
Home page
See merge request Cloud_Solution/diplomatic-quarter!85
5 years ago
Mohammad Aljmma
89cfcd3cad
fix design issues
5 years ago
Mohammad Aljmma
0b90d3c687
fix issues
5 years ago
Mohammad Aljmma
894494ec4e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
...
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma
0b309ebba3
change the home page design
5 years ago
Mohammad Aljmma
874de15040
change the home page design
5 years ago
Mohammad Aljammal
94c25d2188
Merge branch 'loader' into 'diplomatic-quarter-live'
...
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
5 years ago
Elham Rababah
6f5b5ed0c2
move gif loader utils
5 years ago
Elham Rababah
bf412e1edf
Finish loader as Gif image in all cases where the network is busy
5 years ago
Mohammad Aljammal
611c5a46d6
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!83
5 years ago
haroon amjad
d5118bda11
Login / Register UI fixes
5 years ago
Elham Rababah
cd7c354458
loader first step
5 years ago
Mohammad Aljammal
514b483edc
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!82
5 years ago
haroon amjad
bcc04720a5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
haroon amjad
3354058738
Branding updated according to DQ
5 years ago
Mohammad Aljammal
38e206e7a5
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
...
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!81
5 years ago
haroon amjad
3ae6df1dcb
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live
5 years ago
Mohammad Aljammal
baba683d54
Merge branch 'master' into 'diplomatic-quarter-live'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!80
5 years ago
Mohammad Aljammal
a9eb09c560
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!79
5 years ago
haroon amjad
6a630f6d33
logo & colors changed for login & registration flow
5 years ago
Sultan Khan
deb828b4dd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
23b48485ed
voice command
5 years ago
Mohammad Aljammal
342995821d
Merge branch 'master' into 'diplomatic-quarter-live'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!78
5 years ago
Mohammad Aljammal
bdb42e2704
Merge branch 'font' into 'master'
...
add font
See merge request Cloud_Solution/diplomatic-quarter!77
5 years ago
Mohammad Aljmma
1cf4797d4f
add font
5 years ago
Mohammad Aljammal
a8b98849e6
Merge branch 'master' into 'diplomatic-quarter-live'
...
Master
See merge request Cloud_Solution/diplomatic-quarter!76
5 years ago
Mohammad Aljammal
1323551bb1
Merge branch 'hot_fixing' into 'master'
...
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!75
5 years ago
Mohammad Aljmma
26cf849f2b
hot fixing
5 years ago
Mohammad Aljammal
50dffe9af9
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
5 years ago
Mohammad Aljmma
d0ed776ff6
new home health service
5 years ago
haroon amjad
dfa7e0e02f
updates & fixes
5 years ago
haroon amjad
0b6cd845f1
implementing Smart Watch Integration
5 years ago
haroon amjad
22ef24c4ff
Merge branch 'master' into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
5 years ago
Mohammad Aljammal
9126934ef4
Merge branch 'er_location' into 'master'
...
Er location
See merge request Cloud_Solution/diplomatic-quarter!72
6 years ago
jammal
9328f942ba
done ER service
6 years ago
Fatimah Alshammari
1e00b9a4d8
added my-profile
6 years ago
Fatimah Alshammari
56aa60f871
Merge branch 'pharmacy' into pharmacy-Fatima
6 years ago
jammal
7dc55f3378
Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
lib/uitl/translations_delegate_base.dart
6 years ago
jammal
bd2254491c
done ER service
6 years ago
enadhilal
613206f9d3
Merge branch 'enad_pharmacy2' into pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
enadhilal
5445cced89
Merge branch 'master' into enad_pharmacy2
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal
f604b0322a
Merge branch 'ios_issues' into 'master'
...
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!71
6 years ago
jammal
57f938aa09
fix ios issues
6 years ago
Mohammad Aljammal
d90a28aecf
Merge branch 'ios_issues' into 'master'
...
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!70
6 years ago
enadhilal
bf88d84022
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy
...
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
jammal
0fceca8f3e
fix ios issues
6 years ago
enadhilal
7ca6e6caa7
fix widget of product_tile
6 years ago
enadhilal
d6d1c26c9a
add product_tile widget
6 years ago
enadhilal
068382e76f
add call for backend service
6 years ago
haroon amjad
68b0e3857a
updates
6 years ago
Sultan Khan
f03a711dff
symptom checker gender page updated
6 years ago
haroon amjad
6b316bf262
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ health_calculators.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
6 years ago
enadhilal
815bc39268
add wishlist page
6 years ago
haroon amjad
7edb6fd179
UI Fixes in LiveCare
6 years ago
Mohammad Aljammal
62efc13047
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!44
6 years ago
Mohammad Aljammal
e025321c71
fix issues
6 years ago
Mohammad Aljammal
29f0402cbd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal
c1b3b3bbbb
Merge branch 'my_trackers' into 'master'
...
My trackers
See merge request Cloud_Solution/diplomatic-quarter!68
6 years ago
Mohammad Aljammal
d3d0fa00e7
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
...
Conflicts:
lib/pages/landing/home_page.dart
6 years ago
Mohammad Aljammal
e7cf452a79
Merge branch 'insurance' into 'master'
...
files import fix
See merge request Cloud_Solution/diplomatic-quarter!66
6 years ago
Mohammad Aljammal
ecde0b450d
Merge branch 'haroon_s' into 'master'
...
Haroon s
See merge request Cloud_Solution/diplomatic-quarter!67
6 years ago
Mohammad Aljammal
a31796322b
fix icons issue
6 years ago
Mohammad Aljammal
15ac74fadb
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
...
Conflicts:
lib/pages/AlHabibMedicalService/ health_calculators.dart
6 years ago
Mohammad Aljammal
53bbafdc2b
fix Authenticated User Object
6 years ago
Sultan Khan
d0d262f139
robot icon updates
6 years ago
hussam al-habibeh
cd36749e4e
files import fix
6 years ago
Elham Rababah
c0a54c8cbc
remove commit
6 years ago
Sultan Khan
8095e56b32
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
3ad928902b
voice command
6 years ago
Elham Rababah
a359a6cd1a
fix the loader issue
6 years ago
Mohammad Aljammal
b0fa7811e5
Merge branch 'insurance' into 'master'
...
women health
See merge request Cloud_Solution/diplomatic-quarter!65
6 years ago
Mohammad Aljammal
39a4020b69
Merge branch 'child_vaccines' into 'master'
...
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!64
6 years ago
hussam al-habibeh
c6a9b66538
women health
6 years ago
Amjad amireh
83735ab68d
modified Child vaccintion note
6 years ago
haroon amjad
a8ee7db62b
fixes
...
# Conflicts:
# lib/config/config.dart
6 years ago
haroon amjad
41d50e23e3
covid drivethru implemented
6 years ago
Mohammad Aljammal
84bb68789d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
...
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
6 years ago
Mohammad Aljammal
06416b4934
add Not authenticated Page
6 years ago
haroon amjad
5f36c900a4
fixes
6 years ago
haroon amjad
0daa0dc683
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
Sultan Khan
da317431ba
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Elham Rababah
83ab1b4d61
fix issues in the services logic and add some translation
6 years ago
Amjad amireh
8ddec0ad99
child Vaccines add new child modified
6 years ago
Amjad amireh
67e3a13a95
child Vaccines add new child modified
6 years ago
Fatimah Alshammari
d05988a679
added pharmacy folder
6 years ago
Elham Rababah
da7131015e
remove print statements
6 years ago
Mohammad Aljammal
847ccb9c07
Merge branch 'child_vaccines' into 'master'
...
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
6 years ago
Amjad amireh
cb2a78e2ee
child Vaccines
6 years ago
Sultan Khan
7b6135a6c7
voice search
6 years ago
Sultan Khan
83bc2cddce
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
8f18d1025a
voice search
6 years ago
Amjad amireh
24795e808f
child Vaccines
6 years ago
Mohammad Aljammal
60b276f9da
Merge branch 'insurance' into 'master'
...
health Calculator'General Health'
See merge request Cloud_Solution/diplomatic-quarter!61
6 years ago
hussam al-habibeh
84f429e559
merge
6 years ago
hussam al-habibeh
bafcc4331e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
...
Conflicts:
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
pubspec.yaml
6 years ago
hussam al-habibeh
dbda69baa1
health Calculator'General Health'
6 years ago
Amjad amireh
dcb93bf5cc
child Vaccines
6 years ago
Elham Rababah
9ebc6980dd
change the checkup item based on service
6 years ago
Amjad amireh
1d29aa36a2
child Vaccines
6 years ago
Amjad amireh
fe17c20bdf
child Vaccines
6 years ago
Mohammad Aljammal
1ce55e687f
Ambulance Service second step
6 years ago
Amjad amireh
6830996f9c
child Vaccines
6 years ago
Amjad amireh
8a6511404f
child Vaccines
6 years ago
Amjad amireh
42554ffa67
child Vaccines
6 years ago
haroon amjad
063eebfc74
covid drivethru implemented
6 years ago
Elham Rababah
31b217aa19
First step from CMC
6 years ago
Amjad amireh
4009aed000
child Vaccines
6 years ago
Sultan Khan
227731f8f8
Merge
6 years ago
Amjad amireh
e14d619edd
child Vaccines
6 years ago
Amjad amireh
37b817e0c8
child Vaccines
6 years ago
Amjad amireh
0e4ff1f804
child Vaccines
6 years ago
Elham Rababah
0b9a834673
Finish cancel order
6 years ago
Amjad amireh
9ab0d66888
child Vaccines
6 years ago
Elham Rababah
293c557b54
First step from Home health care service
6 years ago
Sultan Khan
ea86e88e2e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
3d6eafe473
Ambulance Service first step
6 years ago
Amjad amireh
db19eec35f
Blood Denote
6 years ago
Sultan Khan
5c859034d6
voice search
6 years ago
Amjad amireh
42fd2e0eee
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
...
Conflicts:
lib/core/viewModels/base_view_model.dart
6 years ago
Amjad amireh
20ef255ee6
Blood Denote
6 years ago
Amjad amireh
98947d5f6b
Blood Denote
6 years ago
Mohammad Aljammal
0d12210116
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
6 years ago
Mohammad Aljammal
c7d396875e
Ambulance Service steps
6 years ago
Mohammad Aljammal
239c275bb8
Merge branch 'h2o' into 'master'
...
Refactor today page
See merge request Cloud_Solution/diplomatic-quarter!60
6 years ago
Elham Rababah
fdc8ef36ef
Refactor today page
6 years ago
Mohammad Aljammal
9aa217c247
Merge branch 'h20_E_referral' into 'master'
...
H20 e referral
See merge request Cloud_Solution/diplomatic-quarter!59
6 years ago
Elham Rababah
0a60b27ab4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/locator.dart
6 years ago
Mohammad Aljammal
ac871bb416
Merge branch 'Blood_Donation' into 'master'
...
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
6 years ago
Mohammad Aljammal
f543126152
Ambulance Service
6 years ago
haroon amjad
6c0bb12c84
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/ContactUs/findus/pharmacies_page.dart
6 years ago
haroon amjad
929e289a6f
started implementing Covid-19 DriveThru Test Module
6 years ago
Amjad amireh
b658e7be4d
Blood Denote
6 years ago
Elham Rababah
dd76ae05a7
fix H2O page issue
6 years ago
Amjad amireh
a00b3a133c
Blood Denote
6 years ago
Amjad amireh
675d544514
Blood Denote
6 years ago
haroon amjad
7fdc0da9dc
livecare scheduling implemented
6 years ago
Amjad amireh
0ec39920f0
Blood Denote
6 years ago
Amjad amireh
5e50c0dc32
Blood Denote
6 years ago
Mohammad Aljammal
020d10fccc
Merge branch 'insurance' into 'master'
...
Health Converter
See merge request Cloud_Solution/diplomatic-quarter!56
6 years ago
Elham Rababah
bf6a8cecc6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
adc673174d
Merge branch 'my_trackers' into 'master'
...
My trackers
See merge request Cloud_Solution/diplomatic-quarter!57
6 years ago
Mohammad Aljammal
bae6fe4ad6
fix marge issues
6 years ago
Elham Rababah
3fab844ac9
improve E-referral
6 years ago
Elham Rababah
37d9eae9ea
improve E-referral
6 years ago
Mohammad Aljammal
3946f0355c
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal
d6a27a8e28
change medical profile icons
6 years ago
haroon amjad
c9256a654a
LiveCare Scheduling updates
6 years ago
Mohammad Aljammal
3ffff9686d
Done allergies service
6 years ago
Elham Rababah
c994c39c6b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
6 years ago
Elham Rababah
a00bc8268e
improve E-referral
6 years ago
Elham Rababah
91a8b94382
Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/landing_page.dart
6 years ago
Elham Rababah
b1b6c77d62
Finish H2O Services
6 years ago
hussam al-habibeh
3e184f43db
Health Converter
6 years ago
Elham Rababah
b853bede68
first step from h2o
6 years ago
Mohammad Aljammal
4bf8345018
Merge branch 'find_us' into 'master'
...
Contact us and virtual tout
See merge request Cloud_Solution/diplomatic-quarter!55
6 years ago
Amjad amireh
43689d19ce
Contact us , virtual tout ,News
6 years ago
Mohammad Aljammal
82c2577d36
Done ask doctor service
6 years ago
Amjad amireh
9a6eadc3fb
Contact us and virtual tout
6 years ago
Sultan Khan
79502de682
update
6 years ago
Sultan Khan
03ff56f2de
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
986a2e92f6
Merge branch 'find_us' into 'master'
...
Find us
See merge request Cloud_Solution/diplomatic-quarter!54
6 years ago
Amjad amireh
7c48a6f16a
Contact us
6 years ago
Amjad amireh
5ce252d296
Contact us
6 years ago
Amjad amireh
50d862b076
Contact us
6 years ago
Amjad amireh
97d0c439c7
Contact us
6 years ago
Amjad amireh
5f981c9248
Contact us
6 years ago
haroon amjad
06798ef327
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/ContactUs/findus/pharmacies_page.dart
6 years ago
haroon amjad
f25d18353f
icons updated
6 years ago
Sultan Khan
591e9e9a4c
updated
6 years ago
Elham Rababah
ae147b5988
first step from search referrals
6 years ago
Mohammad Aljammal
82226e62e1
Merge branch 'insurance' into 'master'
...
HMG Service layout
See merge request Cloud_Solution/diplomatic-quarter!52
6 years ago
Mohammad Aljammal
debb82cb65
Merge branch 'find_us' into 'master'
...
Find us
See merge request Cloud_Solution/diplomatic-quarter!53
6 years ago
Mohammad Aljammal
2952fd56ab
Done Active Medications Service
6 years ago
Elham Rababah
1e3ff89dbd
finish new e-referral except calling the service
6 years ago
Amjad amireh
aa66e427b1
Contact us
6 years ago
Amjad amireh
24456895ee
Contact us
6 years ago
Amjad amireh
24693f2992
Contact us
6 years ago
Amjad amireh
de5633d58b
Contact us
6 years ago
hussam al-habibeh
3c5adc0a1d
HMG Service layout
6 years ago
Elham Rababah
f582eee991
make index page of add new referral as page controller
6 years ago
Mohammad Aljammal
03e009c212
Merge branch 'find_us' into 'master'
...
Find us
See merge request Cloud_Solution/diplomatic-quarter!51
6 years ago
Amjad amireh
6aa6b85f4b
Contact us
6 years ago
Amjad amireh
c2cfea7360
Contact us
6 years ago
Amjad amireh
571023e521
Contact us
6 years ago
Mohammad Aljammal
9f06ce7d1d
done EyeMeasurements service
6 years ago
Amjad amireh
c2b7507005
Contact us
6 years ago
Amjad amireh
dd3608e9ee
Contact us
6 years ago
Elham Rababah
a4905783ad
refactor dialogs structure
6 years ago
Elham Rababah
7840ec4c3b
finish activation process until step 2
6 years ago
Mohammad Aljammal
c01e6095f2
done my trackers
6 years ago
Amjad amireh
a4ea5f8e3e
Contact us
6 years ago
Elham Rababah
f1f3b6bd56
first step from e-referral
6 years ago
Mohammad Aljammal
6caf7290be
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!50
6 years ago
Mohammad Aljammal
0122cc8914
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
6 years ago
Mohammad Aljammal
9a2cbf394b
add images for my trackers
6 years ago
haroon amjad
b9a0438ebb
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
a5fd9f53ab
Payment flow implemented in advance payment
6 years ago
Mohammad Aljammal
14f3e08077
Merge branch 'amjad_amireh' into 'master'
...
edit card_position.dart
See merge request Cloud_Solution/diplomatic-quarter!47
6 years ago
haroon amjad
478917b240
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
Mohammad Aljammal
b4a7408962
Merge branch 'payment_service' into 'master'
...
add payment service page and translations
See merge request Cloud_Solution/diplomatic-quarter!49
6 years ago
Mohammad Aljammal
4ac77593ad
add payment service page and translations
6 years ago
haroon amjad
38c980be81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
5400d534db
updates for push notifications
6 years ago
Mohammad Aljammal
b6db1d1fd8
Merge branch 'my_balance' into 'master'
...
done My balance
See merge request Cloud_Solution/diplomatic-quarter!48
6 years ago
Mohammad Aljammal
a0300738e8
done My balance
6 years ago
Amjad amireh
368db03ab8
edit card_position.dart
6 years ago
Amjad amireh
a41dd736c4
edit card_position.dart
6 years ago
Amjad amireh
d1a01f5afa
edit card_position.dart
6 years ago
Mohammad Aljammal
14bc7354f6
Merge branch 'amjad_amireh' into 'master'
...
Amjad amireh
See merge request Cloud_Solution/diplomatic-quarter!46
6 years ago
Sultan Khan
92efbcbd2f
my family
6 years ago
Sultan Khan
da7fa1038a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
0a2cb22042
design issues fixed
6 years ago
Amjad amireh
c0c175651f
edit card_position.dart
6 years ago
Amjad amireh
6fb063bf48
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
6 years ago
Amjad amireh
dc10f883db
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
6 years ago
Mohammad Aljammal
67713434f1
Merge branch 'patient_sick_leave' into 'master'
...
Patient sick leave
See merge request Cloud_Solution/diplomatic-quarter!45
6 years ago
Mohammad Aljammal
4dd3f9ad01
done Patient Sick Leave
6 years ago
Amjad amireh
e5bdaaa551
edit card_position.dart
6 years ago
Amjad amireh
525080c09e
edit card_position.dart
6 years ago
Mohammad Aljammal
57ed83a139
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
...
Conflicts:
lib/config/config.dart
6 years ago
Mohammad Aljammal
11f9daa3ff
add PatientSickLeave
6 years ago
Sultan Khan
63e6d06e74
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
5e252d21d2
voice search added more medical option
6 years ago
Mohammad Aljammal
d7934a66ab
Merge branch 'amjad_amireh' into 'master'
...
Amjad amireh
See merge request Cloud_Solution/diplomatic-quarter!43
6 years ago
Mohammad Aljammal
ea02622977
fix merge issues
6 years ago
Mohammad Aljammal
fbb4b326a8
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/locator.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
8e96c79d05
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/config/localized_values.dart
6 years ago
Mohammad Aljammal
33bd972984
add my vaccines item screen
6 years ago
Amjad amireh
62d96a3f1c
edit card_position.dart
6 years ago
Sultan Khan
f5d6864291
voice search coc
6 years ago
Sultan Khan
3dc54230be
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
5d34398998
insurance updated
6 years ago
Mohammad Aljammal
fcc3a67ffb
Merge branch 'vaccine' into 'master'
...
edit on vaccine service
See merge request Cloud_Solution/diplomatic-quarter!42
6 years ago
Mohammad Aljammal
9159928e27
edit on vaccine service
6 years ago
Sultan Khan
a535543863
more pages added on the voice search
6 years ago
Amjad amireh
e638464657
edit card_position.dart
6 years ago
Mohammad Aljammal
ddf53ce999
ER
6 years ago
Mohammad Aljammal
50d1e50df4
ER
6 years ago
Mohammad Aljammal
ed1c04ab25
ER
6 years ago
Sultan Khan
7908506d5f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
294a752338
ER
6 years ago
Sultan Khan
77f6dd94ef
search page change
6 years ago
haroon amjad
8387af844a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
0628aef62a
applied dental change in SearchByClinic
6 years ago
Mohammad Aljammal
629251d216
ER
6 years ago
Mohammad Aljammal
4b0365480c
Merge branch 'monthly_reports' into 'master'
...
Monthly reports
See merge request Cloud_Solution/diplomatic-quarter!41
6 years ago
Mohammad Aljammal
b7f73bf397
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports
6 years ago
Mohammad Aljammal
153335538a
done monthly reports
6 years ago
Sultan Khan
a2b3878a27
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
a98bc226e6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
5485cbab36
ER
6 years ago
Mohammad Aljammal
2ef36d3d8a
ER
6 years ago
Mohammad Aljammal
d4d333ef43
Merge branch 'Haroon' into 'master'
...
Dental flow in my appointments
See merge request Cloud_Solution/diplomatic-quarter!39
6 years ago
Mohammad Aljammal
f534f8a348
ER
6 years ago
Sultan Khan
0f63b922d1
speech to text
6 years ago
Mohammad Aljammal
20f9f6f06c
ER
6 years ago
haroon amjad
cbf19f0cd1
Merge branch 'master' into 'Haroon'
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
137e16887c
Merge branch 'dashboard' into 'master'
...
Dashboard
See merge request Cloud_Solution/diplomatic-quarter!40
6 years ago
Mohammad Aljammal
b0f0b87345
fix merge issues
6 years ago
haroon amjad
c5794e5c70
Dental flow in my appointments
6 years ago
Mohammad Aljammal
68466c8d03
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
fe66ee5993
fix lab result issues
6 years ago
Mohammad Aljammal
a75adae281
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!38
6 years ago
Mohammad Aljammal
db79f299b6
ER
6 years ago
Mohammad Aljammal
e254261ef9
ER
6 years ago
Sultan Khan
f6a3f0e615
family file
6 years ago
haroon amjad
2219df0db2
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
Mohammad Aljammal
02ce04a397
medical_profile_page.dart
6 years ago
Mohammad Aljammal
e909c16b80
ER
6 years ago
haroon amjad
3e5ef26b29
my appointment sorting implemented
6 years ago
haroon amjad
ce9903fd13
nearest appointment flow implemented
6 years ago
haroon amjad
51078227ab
Dental appointment flow implemented
6 years ago
Mohammad Aljammal
d52e612bff
Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
1b3a780a29
add ar lan for medical profile
6 years ago
hussam al-habibeh
3a79ddb488
vaccine service
6 years ago
Sultan Khan
826c50ebf1
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
20a17c0070
clinic search
6 years ago
Mohammad Aljammal
f916ff7234
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!37
6 years ago
haroon amjad
779b08e34e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
1886f3a763
implementing Dental Appointment flow
6 years ago
Sultan Khan
4a75215a19
search
6 years ago
Sultan Khan
6b2f1a86df
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
3a4c016f4e
search
6 years ago
Mohammad Aljammal
4ffbb80f3d
ER
6 years ago
Mohammad Aljammal
5ec3935c68
ER
6 years ago
Mohammad Aljammal
ef4a57223c
fix DoctorView.dart UI issues
6 years ago
haroon amjad
a7f5dfab5c
fixes
6 years ago
haroon amjad
35cd02494c
implemented search by doctor list
6 years ago
Mohammad Aljammal
11104f5ef6
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!36
6 years ago
haroon amjad
13adb46319
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
6 years ago
haroon amjad
e29c6a892e
updates
6 years ago
haroon amjad
6ea1ed3eaa
added geolocation dependency in pubspec
6 years ago
haroon amjad
f669adcb9d
Location service implemented
6 years ago
Sultan Khan
badb4e52df
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Mohammad Aljammal
897326fcf1
Merge branch 'dashboard' into 'master'
...
Dashboard
See merge request Cloud_Solution/diplomatic-quarter!34
6 years ago
Mohammad Aljammal
91e5a20fd0
fix merge issues
6 years ago
Mohammad Aljammal
54b766de81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal
d16ea676cf
done parking service ,fix design issues in home page and add new icon
6 years ago
Mohammad Aljammal
01a011a03d
done dashboard page
6 years ago
Sultan Khan
e7a3d1a4ab
speech search
6 years ago
Sultan Khan
f52e73477a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
f1e0bcf86e
speech to tex
6 years ago
haroon amjad
84e92cb040
updates & fixes
6 years ago
haroon amjad
96b7d00b4b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
823eda0d5c
updates
6 years ago
Mohammad Aljammal
4bc806671a
Merge branch 'amjad_amireh' into 'master'
...
filter doctor by department
See merge request Cloud_Solution/diplomatic-quarter!33
6 years ago
Mohammad Aljammal
582853135d
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!31
6 years ago
Mohammad Aljammal
9e47dc19f9
filter doctor by department
6 years ago
Sultan Khan
130fb53a65
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
3247378c02
search
6 years ago
haroon amjad
30e08b4417
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/pages/login/login.dart
6 years ago
haroon amjad
7a8392a97e
updates
6 years ago
Mohammad Aljammal
1954346017
Merge branch 'amjad_amireh' into 'master'
...
Amjad amireh
See merge request Cloud_Solution/diplomatic-quarter!32
6 years ago
Mohammad Aljammal
c0c6376f55
filter doctor by department
6 years ago
Mohammad Aljammal
dc9b9e21ad
filter doctor by department
6 years ago
Mohammad Aljammal
895c09efa4
parking service
6 years ago
Sultan Khan
1974e51602
merge
6 years ago
Sultan Khan
5d112b5464
merge
6 years ago
Sultan Khan
8516f7de1b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
9b55309d53
text to speech
6 years ago
Mohammad Aljammal
418ffb19a2
Merge branch 'dashboard' into 'master'
...
Dashboard
See merge request Cloud_Solution/diplomatic-quarter!30
6 years ago
Mohammad Aljammal
4adc2916b4
fix merge issues
6 years ago
Mohammad Aljammal
30c0963063
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
8989fbc9b7
done design dashboard
6 years ago
Mohammad Aljammal
0709c99e20
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!29
6 years ago
haroon amjad
61dba06236
Twilio implemented in LiveCare
6 years ago
Sultan Khan
2f9885ecf8
family file changes
6 years ago
Sultan Khan
8887ba85fe
family file
6 years ago
haroon amjad
732ab90b2f
Book Appointment check login
6 years ago
Sultan Khan
cb99b2a7a7
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
327c4585a6
family file change
6 years ago
haroon amjad
760db6a873
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/locator.dart
6 years ago
haroon amjad
cc4f5c0615
updates
6 years ago
haroon amjad
5f1413a2ac
implementing Twilio in LiveCare
6 years ago
Mohammad Aljammal
9cf5c80aae
add time line and appointment rate
6 years ago
Mohammad Aljammal
f5b16734c6
add time line
6 years ago
Mohammad Aljammal
a826fcb0fe
Merge branch 'medical_report' into 'master'
...
Medical report
See merge request Cloud_Solution/diplomatic-quarter!28
6 years ago
Mohammad Aljammal
f6d30178bf
done medical report
6 years ago
Mohammad Aljammal
b6319c558c
Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
6 years ago
Mohammad Aljammal
aa60a93a25
Merge branch 'vital_sign' into 'master'
...
Vital sign
See merge request Cloud_Solution/diplomatic-quarter!27
6 years ago
Mohammad Aljammal
41c5263012
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
6 years ago
Mohammad Aljammal
75fdf28036
fix lab Result
6 years ago
Mohammad Aljammal
8495260c5a
fix issues in feedback
6 years ago
haroon amjad
db30fbdfd2
implementing livecare
6 years ago
haroon amjad
59c279998c
working on vital signs integration
6 years ago
Sultan Khan
47c42808fd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
913729fc58
speech search
6 years ago
Mohammad Aljammal
09561ac248
Merge branch 'vital_sign' into 'master'
...
Vital sign
See merge request Cloud_Solution/diplomatic-quarter!26
6 years ago
Mohammad Aljammal
5619b8c06f
fix issues in feedback
6 years ago
Mohammad Aljammal
2b0e35a907
fix issues in base app client
6 years ago
Mohammad Aljammal
d4c9352fd9
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!25
6 years ago
haroon amjad
73cf37a3a5
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad
b9d913e6a5
Merge fixes & updates
6 years ago
Sultan Khan
03b34115c4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
3b2f9251dc
search
6 years ago
Mohammad Aljammal
915de5a871
Merge branch 'vital_sign' into 'master'
...
Vital sign
See merge request Cloud_Solution/diplomatic-quarter!22
6 years ago
Mohammad Aljammal
a5e63817f2
done vital sign
6 years ago
Sultan Khan
4c1a8dc38f
new changes
6 years ago
Sultan Khan
9afeecf9fa
new
6 years ago
Mohammad Aljammal
32e2732c43
feedback service
6 years ago
haroon amjad
3b881f1ab3
appointment details scenarios handled
6 years ago
Amjad Amireh
97dbe62f93
done report service
6 years ago
haroon amjad
7972d01dff
Insurance Approval implemented
6 years ago
haroon amjad
fde47a5c2c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad
206f9a4371
fixes
6 years ago
haroon amjad
750746aabe
updates & fixes
6 years ago
Mohammad Aljammal
d093ecd5e6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
b6c90b869b
add pods file
6 years ago
Mohammad Aljammal
01f8b4e004
Merge branch 'ions_app' into 'master'
...
add ions
See merge request Cloud_Solution/diplomatic-quarter!21
6 years ago
Mohammad Aljammal
f229958e1c
add ions
6 years ago
Mohammad Aljammal
5a17411961
Merge branch 'Haroon' into 'master'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!20
6 years ago
Mohammad Aljammal
22de043892
fix merge issues
6 years ago
Mohammad Aljammal
b4b33be3e9
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
37b874fe3f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
cd09d802bf
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!19
6 years ago
Sultan Khan
3f0c60aea5
sessionID
6 years ago
Mohammad Aljammal
a1fa2c0727
done vital sign
6 years ago
Sultan Khan
da6f238c89
family files changes
6 years ago
haroon amjad
c50530734d
added my appointments in medical file page
6 years ago
Sultan Khan
adbdd2dd0d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
621870eca1
family file changes
6 years ago
haroon amjad
7d0efda1c4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
6 years ago
Mohammad Aljammal
edd850490e
Merge branch 'insurance' into 'master'
...
insurance translation
See merge request Cloud_Solution/diplomatic-quarter!18
6 years ago
hussam al-habibeh
f77d4fac66
insurance translation
6 years ago
Haroon Amjad
8ad2941836
Appointment payment finalised, Ask Doc implemeted & other updates
6 years ago
Haroon Amjad
41c922bfeb
Appointment payment implemented, Book Success implemented, Appointment flow implemented
6 years ago
haroon amjad
3a9fa97c91
updates
6 years ago
Mohammad Aljammal
716482bc4d
Merge branch 'sultan' into 'master'
...
login changes
See merge request Cloud_Solution/diplomatic-quarter!17
6 years ago
Mohammad Aljammal
0c5784fe48
Merge branch 'insurance' into 'master'
...
insurance card and insurance update and insurance approval
See merge request Cloud_Solution/diplomatic-quarter!15
6 years ago
Mohammad Aljammal
5cee1cef4e
fix merge issues
6 years ago
Sultan Khan
6af7ac54ba
login changes
6 years ago
Mohammad Aljammal
2e0afdb49c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
...
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
6 years ago
Mohammad Aljammal
a090339351
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!16
6 years ago
Sultan Khan
d1871bb71f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
8ee3b3b557
family files.
6 years ago
hussam al-habibeh
492cfa084b
insurance card and insurance update and insurance approval
6 years ago
Mohammad Aljammal
32af329915
Merge branch 'medical_profile' into 'master'
...
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!14
6 years ago
Mohammad Aljammal
125360ced7
fix merge issues
6 years ago
Mohammad Aljammal
002efe3b45
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal
b0dc479afa
Merge branch 'sultan' into 'master'
...
registration done.
See merge request Cloud_Solution/diplomatic-quarter!13
6 years ago
Mohammad Aljammal
a84341af58
fix merge issues
6 years ago
Mohammad Aljammal
5ea0df9f1e
Merge remote-tracking branch 'origin/sultan' into sultan
...
# Conflicts:
# lib/uitl/date_uitl.dart
6 years ago
Mohammad Aljammal
4d28209b07
add permission android
6 years ago
Mohammad Aljammal
7d230ea14c
fix issues
6 years ago
Mohammad Aljammal
cfd5b2ccff
feedback Service done
6 years ago
Sultan Khan
8e3fb6831d
registration changes
6 years ago
Sultan Khan
e735855c33
registration done.
6 years ago
haroon amjad
28fde5c500
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
6 years ago
Mohammad Aljammal
1ab34df4f7
Merge branch 'medical_profile' into 'master'
...
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!12
6 years ago
Mohammad Aljammal
29768feefd
merge master
6 years ago
Mohammad Aljammal
05222207da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
a12197fe70
labs result done add some file to git ignore for ios
6 years ago
haroon amjad
1c3e088515
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
6 years ago
haroon amjad
00d9214460
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal
dc4c7ef067
Merge branch 'sultan' into 'master'
...
login changes
See merge request Cloud_Solution/diplomatic-quarter!11
6 years ago
Sultan Khan
ecfa1756d3
login changes
6 years ago
Mohammad Aljammal
7d084162a6
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!10
6 years ago
Sultan Khan
0bc529f420
login changes
6 years ago
haroon amjad
192a3835d6
implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment.
6 years ago
Mohammad Aljammal
1bbbd18373
labs services
6 years ago
Sultan Khan
9d0a2e1e43
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
8d0834ff3e
login inprogress
6 years ago
haroon amjad
b3e5047820
Payment method selection page created, Appointment details functions implemented
6 years ago
Mohammad Aljammal
940b327561
done Prescriptions
6 years ago
haroon amjad
06f95c5379
Appointment Details implementation continued
6 years ago
Sultan Khan
41b438fd74
login page changes
6 years ago
haroon amjad
0171664779
Master Merged in to local
6 years ago
haroon amjad
049d455e3c
Implementing appointment details functions
6 years ago
Mohammad Aljammal
20ab170e7a
Merge branch 'medical_profile' into 'master'
...
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!9
6 years ago
Mohammad Aljammal
ec09721869
fix merge issues
6 years ago
Mohammad Aljammal
5874f4ba21
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal
3e1311e8b8
Merge branch 'sultan' into 'master'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!7
6 years ago
Mohammad Aljammal
5a38479254
fix merge issues
6 years ago
Mohammad Aljammal
1ac420ef7c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan
3a15c16883
login changes
6 years ago
Mohammad Aljammal
43349542da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
6 years ago
Mohammad Aljammal
8de50bfe74
medical - my doctor and prescription services and pages
6 years ago
haroon amjad
f5ddfabf50
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
6 years ago
Mohammad Aljammal
392a5a57ed
Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
...
Design and return Pharmacy List
See merge request Cloud_Solution/diplomatic-quarter!8
6 years ago
hussam al-habibeh
e92cb2e1ac
Design and return Pharmacy List
6 years ago
haroon amjad
7f4fbadfab
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
6 years ago
haroon amjad
d8fe501341
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan
31fe444150
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
b0989d6ca0
login pages changes
6 years ago
Sultan Khan
76aeeffad7
login page changes
6 years ago
Mohammad Aljammal
93bfcbc20f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
...
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
6 years ago
Mohammad Aljammal
ae2f9a077d
Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
...
design for search medicine and return medicine list
See merge request Cloud_Solution/diplomatic-quarter!6
6 years ago
Mohammad Aljammal
e147787be9
merge search and return medicine
6 years ago
Mohammad Aljammal
01b230accf
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
6 years ago
Sultan Khan
5b411c3120
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
c018597d90
confrim login page added
6 years ago
haroon amjad
e34da6485b
Doctor Free Slots implemented
6 years ago
Mohammad Aljammal
bbb6dcd913
Merge branch 'sultan_merge' into 'master'
...
Sultan merge
See merge request Cloud_Solution/diplomatic-quarter!5
6 years ago
Mohammad Aljammal
4bc68c6afd
merge sultan
6 years ago
Mohammad Aljammal
2d5b725818
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
b2b6ce1f76
Merge branch 'merge_haron' into 'master'
...
Merge haroon
See merge request Cloud_Solution/diplomatic-quarter!4
6 years ago
Mohammad Aljammal
b2875fbce3
merge haroun
6 years ago
hussam al-habibeh
31d2816e64
design for search medicine and return medicine list
6 years ago
Mohammad Aljammal
3a68e0e092
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
...
Conflicts:
lib/config/config.dart
lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan
5a08cb720c
login changes
6 years ago
Mohammad Aljammal
fc749de77e
create doctor card and medical page
6 years ago
Sultan Khan
f8d8e1c685
new pages added
6 years ago
Sultan Khan
192b21a7e7
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
# Conflicts:
# lib/main.dart
# lib/widgets/input/date_picker/button_actions.dart
# lib/widgets/input/text_field.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan
8dd38a8b3c
no message
6 years ago
haroon amjad
ca7b4534a8
Search By Clinic & Search By Doctor Name implemented
6 years ago
Haroon Amjad
9eb9f01dbd
Get Clinic List API Implemented, Architecture for HTTP requests implemented
6 years ago
Mohammad Aljammal
d02151bea8
fix import in main
6 years ago
haroon amjad
a0173c5b4d
Appointment Details page, ToDo List Page implemented
6 years ago
Mohammad Aljammal
d13e7186a6
Merge branch 'mvvm_and_di' into 'master'
...
add MVVM and di Mohammad Aljammal and Elham Rababah
See merge request Cloud_Solution/diplomatic-quarter!1
6 years ago
Mohammad Aljammal
257cc92691
add MVVM and di Mohammad Aljammal and Elham Rababah
6 years ago
haroon amjad
9842c3a0b1
Translation updates
6 years ago
haroon amjad
1554a6bdf5
Book Appointment Flow added
6 years ago
Sultan Khan
d897463b42
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
6 years ago
Sultan Khan
4a0cc17069
login module started
6 years ago
Mohammad Aljammal
198a1854a9
add documentation Mohammad Aljammal and Elham Rababah
6 years ago
Mohammad Aljammal
6d6c71655a
add new widget by Elham Rababah and Mohammad Aljammal
6 years ago
Mohammad Aljammal
19676549e1
add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file
6 years ago
Mohammad Aljammal
3ed5c3878f
init project structure By Mohammad and Elham
6 years ago