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 |
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
|
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
|
f029aaa1c6
|
Fixes & code optimizations
|
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 |
haroon amjad
|
f60684ad08
|
Notifications UI redesigned
|
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 |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
haroon amjad
|
dfafb6b664
|
fixes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
haroon amjad
|
0fe4a21388
|
updates & fixes
|
4 years ago |
Mirza.Shafique
|
afb08fcd0a
|
Booking Filters Update
|
4 years ago |
haroon amjad
|
45272d251c
|
Updates & fixes
|
4 years ago |
Sultan Khan
|
233a273316
|
shcedule page
|
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
|
d1fc4751ad
|
BUG FIXES
|
4 years ago |
Mirza.Shafique
|
089ad0d321
|
Booking appointment 1.3
|
4 years ago |
Sultan Khan
|
1a501a3b2a
|
calendar events changes
|
4 years ago |
Sultan Khan
|
4325bd3448
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
5fe6a6c3dd
|
doctor schedule
|
4 years ago |
Mirza.Shafique
|
d2b2b4063d
|
Booking appointment 1.1
|
4 years ago |
haroon amjad
|
5f521556dc
|
Dental flow fixes
|
4 years ago |
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
4 years ago |
haroon amjad
|
eadba3f767
|
Working on livecare appointment booking page
|
4 years ago |
haroon amjad
|
5007064105
|
Jira fixes
|
5 years ago |
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
5 years ago |
Sultan Khan
|
b891c1bd80
|
theme issue
|
5 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
5 years ago |
haroon amjad
|
deb0b40cfe
|
fixes
|
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 |
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
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 |