Commit Graph

1786 Commits (afb08fcd0a404ab9e69a005a69ae686e5c977e54)
 

Author SHA1 Message Date
Mirza.Shafique afb08fcd0a Booking Filters Update 3 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
3 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 3 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 3 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 3 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 3 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 3 years ago
Sikander Saleem a09b43ef8c monthly report ui redesigned. 3 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sikander Saleem cd85ad4f8a feedback ui redesigned. 3 years ago
haroon amjad 45272d251c Updates & fixes 3 years ago
haroon amjad 8e7786cb96 updates & fixes 3 years ago
Sikander Saleem 1b7b7b6334 live chat ui redesigned. 3 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 3 years ago
Sikander Saleem d1b7c94d6e improvement. 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 ab0e388cbe Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!385
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 b90c189b6d Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!384
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 75c0de091f Merge branch 'Haroon' into 'development'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!383
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 c6e7c8cd37 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 52665fe217 login issue fixed 3 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
3 years ago
Sikander Saleem 7df76842b2 Merge branch 'development_new_design_2.0' into new_design_sikander 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
Sikander Saleem f3d7686a10 improvement. 3 years ago
Sultan Khan ad7527ee65 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 233a273316 shcedule page 3 years ago
Mirza.Shafique 3f0d8626e7 Marge issue 3 years ago
Mirza.Shafique 590ea48ea9 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/MyAppointments/SchedulePage.dart
3 years ago
Mirza.Shafique e1e3741abf Event Reminder 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