Commit Graph

104 Commits (fc67d0d14d20355d6e6aee41887aa6bb378ed8dc)

Author SHA1 Message Date
haroon amjad cb220031dd Updates & fixes 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan 1b387c2dbf changes pushed 3 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
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
haroon amjad 89e1aa70c0 updates 3 years ago
haroon amjad 22c6a8ce42 no message 3 years ago
Sultan Khan fee23de1fd hhc changes 3 years ago
haroon amjad f6d779431a fixes 3 years ago
Sultan Khan 5fe0214e04 bug fixes 3 years ago
Sultan Khan 5b988dff4f BUG FIXES 3 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
haroon amjad 0fe4a21388 updates & fixes 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 3 years ago
haroon amjad e679c7df0d updates & fixes 3 years ago
Sikander Saleem 62ca009404 improvement. 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
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 d1c99d1d82 ER Average waiting time label applied 3 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem acd3855c77 Merge branch 'development' into development_new_design_2.0 3 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 3 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 3 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 3 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Zohaib Iqbal Kambrani 10a147860c no message 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago