Commit Graph

1932 Commits (ab8030416c05f31213d34b9397afcd9532bb2b0a)
 

Author SHA1 Message Date
haroon amjad 4560037f97 updates 3 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
3 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 3 years ago
Sikander Saleem 402cf5936a improvement. 3 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
3 years ago
Sikander Saleem bf920d4188 find us redesigned. 3 years ago
Sultan khan ba245fdfef Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!378
3 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d1fc4751ad BUG FIXES 3 years ago
Mirza.Shafique ebf293736d Booking appointment Marge 3 years ago
Zohaib Iqbal Kambrani d1c99d1d82 ER Average waiting time label applied 3 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 3 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 3 years ago
Sikander Saleem 363cf78884 improvement. 3 years ago
Sikander Saleem b78f8f76db improvement. 3 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 3 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
3 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
3 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 3 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 3 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 3 years ago
Sikander Saleem 3cc18cfb24 medical reports ui redesigned. 3 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 3 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 239ad530ce fixed isuues 3 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

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

See merge request Cloud_Solution/diplomatic-quarter!373
3 years ago
mosazaid a2e60e7584 fix bugs pharmacy 3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 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
3 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
3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Sikander Saleem 9e75a45cd5 improvement. 3 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 3 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 1a501a3b2a calendar events changes 3 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 3 years ago
haroon amjad 1db2f9ab03 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!372
3 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 3 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 3 years ago
Mirza.Shafique ba0c0beef6 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 3 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 3 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 3 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
3 years ago