haroon amjad
|
3eb7a4325b
|
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
|
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
|
efced34ffa
|
Updates
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |
haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
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
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
haroon amjad
|
7bc8f69dfb
|
JIRA bug fixes
|
4 years ago |
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
2a92478d01
|
nfc plugin improvement.
|
4 years ago |
haroon amjad
|
3b9c1eb9ed
|
Appointment booking fix
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
fe7baeab3c
|
LiveCare permissions
|
4 years ago |
Sikander Saleem
|
4518a26ff1
|
video call improvement.
|
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
|
6d970800f9
|
Book Appo fix
|
4 years ago |
devmirza121
|
7f8a0320a7
|
Medical Reminder 1.0
|
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 |
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 |
Sikander Saleem
|
9a82b9c369
|
laser clinic added.
|
4 years ago |
haroon amjad
|
289e74fd0a
|
fixes
|
4 years ago |
haroon amjad
|
70304427f9
|
Doc specialty fix
|
4 years ago |
haroon amjad
|
b752b42a34
|
Updates & fixes
|
4 years ago |
haroon amjad
|
c253ec3110
|
LiveCare UI revamped
|
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 |
haroon amjad
|
e82b8d4439
|
Lakum & other fixes
|
4 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
4 years ago |
haroon amjad
|
5692bc66a9
|
Removing anatomy pub from project
|
4 years ago |
haroon amjad
|
668d725b25
|
Laser booking
|
4 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
4 years ago |
haroon amjad
|
2a212149ed
|
Health converters UI done
|
4 years ago |
haroon amjad
|
b53d912996
|
Fixes & updates
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
Mirza.Shafique
|
0ba4e9047b
|
design fixes 1.0
|
4 years ago |
Sikander Saleem
|
f13871de9a
|
find us and prescription availability hospital location ui changes,
|
4 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
4 years ago |
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
4 years ago |
haroon amjad
|
58c78656bf
|
Rating dialog updates
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
f6b96dcb7b
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByDoctor.dart
|
4 years ago |
Sikander Saleem
|
c9662c7451
|
schedule appointment navigation fix.
|
4 years ago |
haroon amjad
|
3f3ddd7af0
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
4 years ago |
haroon amjad
|
503ab739ca
|
prescription availability design revamped
|
4 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
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
6099738a5c
|
improvements
|
4 years ago |
Sikander Saleem
|
df31c82fd5
|
doctor header review on tap improvement.
|
4 years ago |
haroon amjad
|
89e1aa70c0
|
updates
|
4 years ago |
haroon amjad
|
8cc36ae848
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
dfafb6b664
|
fixes
|
4 years ago |
Sikander Saleem
|
df32ae0142
|
lab order clinic/hospital name, prescription reminder ui, prescription availibility
|
4 years ago |
haroon amjad
|
184942e891
|
Covid Payment fixes
|
4 years ago |
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
19e6954bc8
|
updates
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 years ago |
haroon amjad
|
a2e25f7a7a
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
999a45c711
|
App Expendable Design Change
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
haroon amjad
|
0fe4a21388
|
updates & fixes
|
4 years ago |
haroon amjad
|
f946a7be4d
|
updates & fixes
|
4 years ago |
haroon amjad
|
2d7c7239c5
|
Health Converters fixes
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
4 years ago |
haroon amjad
|
ec646a7039
|
My Invoice fixes, Prescription page fixes
|
4 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
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
4 years ago |
Sikander Saleem
|
aa047afef7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
|
4 years ago |
Mirza.Shafique
|
afb08fcd0a
|
Booking Filters Update
|
4 years ago |
Sikander Saleem
|
1db8c96ed7
|
title improvement for book appointment clinic search.
|
4 years ago |
haroon amjad
|
ebcc2559ce
|
Ask doctor issue resolved, Translation & font family issues resolved
|
4 years ago |
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
4 years ago |
haroon amjad
|
45272d251c
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
ef5f737084
|
Merge branch 'development' into development_new_design_2.0
|
4 years ago |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
62ca009404
|
improvement.
|
4 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
|
4 years ago |
Sultan Khan
|
233a273316
|
shcedule page
|
4 years ago |
Mirza.Shafique
|
3f0d8626e7
|
Marge issue
|
4 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
|
4 years ago |
Mirza.Shafique
|
e1e3741abf
|
Event Reminder
|
4 years ago |
haroon amjad
|
3abd7227ec
|
fixes
|
4 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
|
4 years ago |
haroon amjad
|
4560037f97
|
updates
|
4 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
|
4 years ago |
Sultan Khan
|
1726f8cc11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
d1fc4751ad
|
BUG FIXES
|
4 years ago |