Elham Rababh
|
055b888ba2
|
fix address
|
4 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
4 years ago |
haroon amjad
|
e679c7df0d
|
updates & fixes
|
4 years ago |
haroon amjad
|
b83318faf8
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!382
|
4 years ago |
haroon amjad
|
f8c295defe
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!381
|
4 years ago |
haroon amjad
|
8cb9a5e619
|
updates
|
4 years ago |
haroon amjad
|
faff3b90cb
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/core/service/er/am_service.dart
|
4 years ago |
haroon amjad
|
e9ec2e2faf
|
Ambulance request APIs revamped
|
4 years ago |
Zohaib Iqbal Kambrani
|
d1c99d1d82
|
ER Average waiting time label applied
|
4 years ago |
haroon amjad
|
21c3686e05
|
Ambulance request services revamping
|
4 years ago |
Mohammad Aljammal
|
8b3a0b3ada
|
Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
|
4 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
|
4 years ago |
haroon amjad
|
5009e48f64
|
Updates in Ambulance Request & Covid test
|
4 years ago |
Elham Rababh
|
ab2fc6aa2c
|
fix issues related to footer
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
10a147860c
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
4 years ago |
Zohaib Iqbal Kambrani
|
e4256d6874
|
RRT in progress (Service implementations)
|
5 years ago |
Sultan khan
|
ba32a37a17
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!339
|
5 years ago |
Zohaib Iqbal Kambrani
|
4da163d186
|
RRT in progress in stage
|
5 years ago |
Sultan khan
|
54e1d51f18
|
Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress
See merge request Cloud_Solution/diplomatic-quarter!337
|
5 years ago |
Zohaib Iqbal Kambrani
|
5f1d753895
|
no message
|
5 years ago |
Haroon Amjad
|
47e521fe1d
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
5 years ago |
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
5 years ago |
haroon amjad
|
7b6270c67f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
Elham Rababah
|
36d422c7aa
|
PAP-563: fix pickup location from hospital
|
5 years ago |
Elham Rababah
|
aa1c92c142
|
PAP-562: fix status
|
5 years ago |
haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
5 years ago |
Elham Rababah
|
66a9239698
|
PAP-558: Remove the choose Drop-off
|
5 years ago |
haroon amjad
|
a6a9a92c6f
|
JIRA bug fixes
|
5 years ago |
haroon amjad
|
f754e48034
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
|
5 years ago |
haroon amjad
|
49c454b132
|
fixes
|
5 years ago |
Elham Rababah
|
86dda2b6d6
|
PAP-560: fix design
|
5 years ago |
Elham Rababah
|
a1ecfbf16a
|
PAP-560: fix design
|
5 years ago |
Elham Rababah
|
efb6ea68b8
|
PAP-561: fix design
|
5 years ago |
Elham Rababah
|
2e035e2c6b
|
PAP-576: fix design
|
5 years ago |
haroon amjad
|
33e1bf8103
|
Jira fixes
|
5 years ago |
Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
5 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
5 years ago |
Mohammad Aljammal
|
4457b5f109
|
add translation to ER service
|
5 years ago |
Mohammad Aljammal
|
200334d8f8
|
Fix ER service
|
5 years ago |
mosazaid
|
5bcc67b77d
|
Nearest Er fix design
|
5 years ago |
mosazaid
|
01bfe84644
|
solving NearestEr design problem
|
5 years ago |
Mohammad Aljammal
|
634c874eee
|
fix design issues
|
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 |
Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
5 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
5 years ago |
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
5 years ago |
jammal
|
9328f942ba
|
done ER service
|
5 years ago |
jammal
|
bd2254491c
|
done ER service
|
5 years ago |