 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 |
haroon amjad
|
e9c26ee85f
|
Dental procedures implemented
|
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 |
|
Mirza.Shafique
|
ad025f3d8e
|
Booking appointment 1.2
|
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 |
Zohaib Iqbal Kambrani
|
d33432d238
|
Covid Drive-Thru Questions Screen
|
4 years ago |
|
haroon amjad
|
73097d15de
|
Covid Lab result generate certificate implemented
|
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 |
|
haroon amjad
|
5f521556dc
|
Dental flow fixes
|
4 years ago |
|
Sikander Saleem
|
288d64214e
|
improvements
|
4 years ago |
|
Sikander Saleem
|
bb18645d85
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Sikander Saleem
|
5ab9dd1761
|
Appointment screen Changes & improvements.
|
4 years ago |
Sultan Khan
|
57d87dfc03
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
11ffed2ae3
|
bug fixes
|
4 years ago |
|
haroon amjad
|
cbbca5ce86
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
0121337d1b
|
LiveCare Flow from book appointment flow implemented
|
4 years ago |
|
Sikander Saleem
|
6c8f1c6185
|
merge improvement.
|
4 years ago |
|
Sikander Saleem
|
197e7d5742
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
4 years ago |
|
Sikander Saleem
|
b3fd1cb93d
|
lab result detail flow chart screen & improvement.
|
4 years ago |
Fatimah Alshammari
|
787b55a803
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
# lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Fatimah Alshammari
|
34ccb132dc
|
fixed issues
|
4 years ago |
|
haroon amjad
|
cbbef80bd5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
eadba3f767
|
Working on livecare appointment booking page
|
4 years ago |
|
Sikander Saleem
|
bb20d65b40
|
lab result detail screen.
|
4 years ago |
hussam al-habibeh
|
a33a6b0b2f
|
push request after conflict resolve
|
4 years ago |
|
hussam al-habibeh
|
0a3c44b5e8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5c8e9f4e19
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!352
|
4 years ago |
|
haroon amjad
|
2242b78116
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
f442cc251c
|
Pre Post Images Dental Doctor Profile
|
4 years ago |
|
haroon amjad
|
a32501f3dc
|
My invoices implementation continued
|
4 years ago |
|
Sikander Saleem
|
80c50e29bf
|
Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
4 years ago |
|
Sikander Saleem
|
4db432b351
|
lab results working(cont.) & improvements
|
4 years ago |
|
Mirza.Shafique
|
38465eaafb
|
Home page icons and drawer
|
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 |
|
hussam al-habibeh
|
d3868844de
|
Medication availability
|
4 years ago |
|
Mirza.Shafique
|
06f877b8d4
|
Home page new design & drawer
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
bf303a7be0
|
RRT Implementation
|
4 years ago |
|
Mirza.Shafique
|
99c6318410
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
|
Mirza.Shafique
|
2d62822536
|
Medical Profile Page improvements
|
4 years ago |
|
Sikander Saleem
|
f482595d6b
|
merge improvements.
|
4 years ago |
|
Mirza.Shafique
|
4ebf5f900b
|
improvements.
|
4 years ago |
|
Mirza.Shafique
|
32e867421f
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
# lib/uitl/date_uitl.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mirza.Shafique
|
bbaeec5b85
|
Medical Profile Complete
|
4 years ago |
|
Sikander Saleem
|
14561d0ac6
|
merge changes-1
|
4 years ago |
|
Mirza.Shafique
|
3c438406b5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
4 years ago |