Commit Graph

597 Commits (d2d22ff1fcc0310d72efb705b961fa0cfb00c07f)

Author SHA1 Message Date
Sultan Khan d2d22ff1fc 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 73ff5c4707 Bug 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
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 e679c7df0d updates & fixes 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 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 52665fe217 login issue fixed 3 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 3 years ago
Sikander Saleem bf920d4188 find us redesigned. 3 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 3 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 3 years ago
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 3 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 239ad530ce fixed isuues 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 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
3 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
3 years ago
Sikander Saleem 9e75a45cd5 improvement. 3 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 3 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 3 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 3 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 3 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 3 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 3 years ago
Sikander Saleem 970887b0c5 changes 3 years ago
Sikander Saleem 71f888ea9b improvements 3 years ago
Sikander Saleem 51c398e84a Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 3 years ago
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 3 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 3 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 3 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 3 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 5647ab75e5 improvements. 3 years ago
Mirza.Shafique b2bba050e8 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
3 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 3 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 3 years ago