haroon amjad
|
badc13d41a
|
sickleave CR Enabled
|
3 years ago |
Sultan khan
|
83c15196c8
|
VIDA PLUS CHANGE
|
3 years ago |
haroon amjad
|
b304332526
|
Patient app release to stores 10.4
|
3 years ago |
haroon amjad
|
9d2df00d87
|
Get General instructions implemented
|
3 years ago |
Sultan khan
|
c48f393f95
|
Dubai registration fixed
|
3 years ago |
haroon amjad
|
e79454973c
|
InPatient API
|
3 years ago |
haroon amjad
|
af90ab3aa3
|
Sickleave & chart changes
|
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
|
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
|
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
|
0e01835327
|
Target SDK & Compile SDK bumped to 33
|
3 years ago |
haroon amjad
|
25af2c23ef
|
Sick leave CR, LiveCare support call, Appo calendar changes
|
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
|
7ae4e7d616
|
updates & fixes
|
3 years ago |
haroon amjad
|
d75615a2eb
|
Updates & fixes
|
3 years ago |
haroon amjad
|
106334c9cf
|
updates & fixes
|
3 years ago |
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
4 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
4 years ago |
haroon amjad
|
833818e6e3
|
Rad & Lab email issues fixes
|
4 years ago |
haroon amjad
|
11529c65c5
|
updates
|
4 years ago |
haroon amjad
|
4ba229c436
|
Updates
|
4 years ago |
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7018696328
|
E-Cens sign off
|
4 years ago |
haroon amjad
|
3396b4253b
|
Updates & fixes
|
4 years ago |
haroon amjad
|
f9a733884d
|
Calendar fixes
|
4 years ago |
haroon amjad
|
27c6837f25
|
updates & fixes
|
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
|
f1129cc14c
|
updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
612d9eb019
|
Project Filter Applied on Packages & Offers
|
4 years ago |
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
4 years ago |
haroon amjad
|
8d988ba994
|
updates & fixes
|
4 years ago |
haroon amjad
|
4ba37d342c
|
RRT Updates
|
4 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
haroon amjad
|
72e2707d4b
|
updates
|
4 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
haroon amjad
|
60a44f9a42
|
OpenTok fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
haroon amjad
|
2a343db335
|
updates
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
haroon amjad
|
3eb7a4325b
|
updates & fixes
|
4 years ago |
Haroon Amjad
|
1cb7eb2afb
|
CS branch changes
|
4 years ago |
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
a6c6651363
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7dbc00a864
|
ancillary orders update
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
haroon amjad
|
6d88607631
|
Updates & fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
4 years ago |
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Elham Rababh
|
16c1064a45
|
PMAU-19
|
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
|
cf27c3e796
|
Incoming call & LiveCare pending UI revamped
|
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 |
Elham Rababh
|
12e47aba82
|
fix as first step
|
4 years ago |
devmirza121
|
7d2a6c794b
|
Clinic Search Dialog
|
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 |
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 |
Elham Rababh
|
275871bc39
|
fix addcustomeraddress
|
4 years ago |
hussam al-habibeh
|
b09bc3bef9
|
merge dev to hussam pharmacy fix
|
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 |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
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 |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e1e31de818
|
Lakum fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
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
|
585e26b091
|
Registration fix
|
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 |
Sikander Saleem
|
cd81f05a8d
|
laser clinic design (cont.)
|
4 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
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 |
Elham Rababh
|
d486b76116
|
fix merge issue
|
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 |
Mirza.Shafique
|
69db41364f
|
icon fixs
|
4 years ago |
Elham Rababh
|
616748dc6f
|
fix proceed button
|
4 years ago |
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
4 years ago |
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
4 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
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
|
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
|
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 |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
4 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
75d3751719
|
Offers API
|
4 years ago |
Sikander Saleem
|
14ccae993e
|
my tracker tabs switching issue fixed.
|
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
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Sikander Saleem
|
0b4305de03
|
all dialog changes and improvements (cont).
|
4 years ago |
Sultan Khan
|
a39658206d
|
my family
|
4 years ago |
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
4 years ago |
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
4 years ago |
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
haroon amjad
|
22c6a8ce42
|
no message
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
4 years ago |
Sultan Khan
|
2ebfdcfdd7
|
login issue fixed
|
4 years ago |
Sultan Khan
|
1d36076320
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
dd58b8637b
|
bug fixs
|
4 years ago |
Mirza.Shafique
|
96b971ef01
|
CMC 1.6
|
4 years ago |
Sultan Khan
|
c6404a2a0b
|
tracker services
|
4 years ago |
haroon amjad
|
2669378da4
|
Insurance Approval API updated
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
5 years ago |
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
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 |
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 |
Mirza.Shafique
|
e1e3741abf
|
Event Reminder
|
5 years ago |
haroon amjad
|
4c2b70fcb5
|
Merge branch 'development' into Haroon
|
5 years ago |
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
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 |
mosazaid
|
a2e60e7584
|
fix bugs pharmacy
|
5 years ago |
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
5 years ago |
haroon amjad
|
e96157c74a
|
Covid certificate passport CR implemented
|
5 years ago |
haroon amjad
|
5f521556dc
|
Dental flow fixes
|
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 |
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
|
74d0826342
|
fixed issues
|
5 years ago |
Elham Rababh
|
1568698b98
|
fix issues related to wight and sugar blood
|
5 years ago |
hussam al-habibeh
|
8f5fef87e9
|
add blood pressure translation issue
|
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
|
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 |
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 |
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
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 |
Sultan Khan
|
97d7f9225e
|
package name changed
|
5 years ago |
Sultan Khan
|
7c398ba40d
|
bug fix
|
5 years ago |
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
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
|
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
|
ed20ba65b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
8766a69928
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
hussam al-habibeh
|
981e78936e
|
jira bugs
|
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 |
Sultan khan
|
f54b9a63aa
|
Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp
See merge request Cloud_Solution/diplomatic-quarter!328
|
5 years ago |
Haroon Amjad
|
213d104d57
|
Covid test procedure selection implemented
|
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 |
Mirza.Shafique
|
e934e7cd2c
|
Merge Fix
|
5 years ago |
hussam al-habibeh
|
fefde8f575
|
jira bugs
|
5 years ago |
haroon amjad
|
bcb4f48785
|
build fix
|
5 years ago |
hussam al-habibeh
|
854352d9ce
|
jira bugs
|
5 years ago |
Sultan Khan
|
cd7845b1a4
|
bug fix
|
5 years ago |
Fatimah Alshammari
|
71a393df68
|
fixed categories issue
|
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
|
7c1fd8043b
|
fix chart and eye and balance
|
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
|
f9b8191a5e
|
jira bugs
|
5 years ago |
Zohaib Iqbal Kambrani
|
6f2c947687
|
Packages And offers..
|
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 |
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
|
e0ebb922ed
|
pharmacy fixes
|
5 years ago |
Zohaib Iqbal Kambrani
|
f410ce20ca
|
Packages and Offers in Progress
|
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 |
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 |
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 |
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 |
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 |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
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 |
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
5 years ago |
Zohaib Iqbal Kambrani
|
516df96e21
|
no message
|
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
|
8899bdf460
|
Done Prescription Delivery Address
|
5 years ago |
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
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 |
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 |
mosazaid
|
b70c7d7d05
|
fix pharmacy auth
|
5 years ago |
enadhilal
|
292e983614
|
fixing issues
|
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 |
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 |
Sultan Khan
|
d33918c932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
5 years ago |
haroon amjad
|
0b83089b86
|
Merge branch 'development' into Haroon
|
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
|
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
|
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 |
mosazaid
|
38d52b52c8
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
|
5 years ago |