Commit Graph

343 Commits (b3dffc992c8d9bbfb41a848f9fcecea7cf0b4db7)

Author SHA1 Message Date
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad b1128be94f Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 4 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 4 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
haroon amjad 106489b085 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 4 years ago
Sultan Khan 671c432cd7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 0086875d0d Design Updated for tracker 4 years ago
Sikander Saleem a09b43ef8c monthly report ui redesigned. 4 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 4 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 73ff5c4707 Bug fixes 4 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
4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 4 years ago
Sikander Saleem 3cc18cfb24 medical reports ui redesigned. 4 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 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
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 5 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 5 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 5 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 5 years ago
Sikander Saleem 970887b0c5 changes 5 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
5 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
5 years ago