Commit Graph

1762 Commits (4f85652562b87f3eab47a1b1a31a1b09e3d71351)
 

Author SHA1 Message Date
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique f577905dcb eye measurment new design 3 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
3 years ago
haroon amjad 75c0de091f Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!383
3 years ago
haroon amjad 44d59ed01a updates & fixes 3 years ago
Sikander Saleem e3758cfbba Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem ff5fbbdf7c Service info app bar fixed. 3 years ago
Sikander Saleem fab051f9e7 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
3 years ago
Sikander Saleem 6a86d8d1c1 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 62ca009404 improvement. 3 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 3 years ago
Sultan Khan 52665fe217 login issue fixed 3 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
3 years ago
Sikander Saleem 7df76842b2 Merge branch 'development_new_design_2.0' into new_design_sikander 3 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
3 years ago
Sikander Saleem f3d7686a10 improvement. 3 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 3 years ago
Sultan Khan 233a273316 shcedule page 3 years ago
Mirza.Shafique 3f0d8626e7 Marge issue 3 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
3 years ago
Mirza.Shafique e1e3741abf Event Reminder 3 years ago
haroon amjad b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
3 years ago
haroon amjad f8c295defe Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!381
3 years ago
haroon amjad 8cb9a5e619 updates 3 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
3 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 3 years ago
Zohaib Iqbal Kambrani d9672c47a0 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  BUG FIXES
  fix issues  PAP-910,PAP-911
  fix bugs pharmacy
  Dental procedures implemented
  Revert "Merge branch 'foote_in_all_pages' into 'development'"
  fixed products issues
  calendar events changes
  Covid passport CR implemented in Covid test flow
  doctor schedule
  Covid certificate passport CR implemented
  Covid Lab result generate certificate implemented
  return bottom sheet inside appointments list
  fix issues related to footer
  remove unused code
  remove footer from pharmacy pages
  first step from add footer for all pages

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan abcd207554 schedule page fix 3 years ago
haroon amjad 3abd7227ec fixes 3 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
3 years ago
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