Commit Graph

1402 Commits (3abd7227ec5cbede551de07e56246bfca583e4ea)

Author SHA1 Message Date
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 402cf5936a improvement. 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
Sikander Saleem bf920d4188 find us redesigned. 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
Sikander Saleem 363cf78884 improvement. 4 years ago
Sikander Saleem b78f8f76db improvement. 4 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 4 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
4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 4 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 4 years ago
Sikander Saleem 3cc18cfb24 medical reports ui redesigned. 4 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 4 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
4 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
4 years ago
mosazaid a2e60e7584 fix bugs pharmacy 4 years ago
haroon amjad e9c26ee85f Dental procedures implemented 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 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
4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 4 years ago
Sikander Saleem 9e75a45cd5 improvement. 4 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 4 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 1a501a3b2a calendar events changes 4 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 4 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 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 ba0c0beef6 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 4 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 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
4 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 4 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 4 years ago
haroon amjad d83a611d95 FCM Permission fix 4 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
4 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 4 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 2ba91e54ab merge-changes 4 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
4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago