Commit Graph

724 Commits (41a4005d410bb2bc2a94d1bcb69ebc8cd154b688)

Author SHA1 Message Date
Sikander Saleem 41a4005d41 Merge branch 'refs/heads/master' into dev_sikander 3 days ago
aamir-csol 0c2fe81c99 Merge branch 'master' into dev_aamir 4 days ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 4 days ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
6 days ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
6 days ago
haroon amjad b0708d85d9 updates & fixes 6 days ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 6 days ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
6 days ago
aamir-csol 8b701255ed logout & family file fix 6 days ago
haroon amjad 7ead6d79e5 updates 6 days ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 6 days ago
haroon amjad e4b6360808 Services Page fix 6 days ago
haroon amjad f46f978326 Clinic icons updated 7 days ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 7 days ago
haroon amjad 10a5a6f558 Ask Doctor implemented 1 week ago
haroon amjad d2deb974b1 symptoms merge 1 week ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 1 week ago
haroon amjad f54ce71177 translation changes 1 week ago
faizatflutter 07447e148b Symptoms Checker flow is completed 1 week ago
haroon amjad 6faca94b89 updates 1 week ago
haroon amjad 99282f34e3 Added language change option in landing page 1 week ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
1 week ago
faizatflutter 4ceca016bb Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
1 week ago
faizatflutter 3bdc4e246f refactor 1 week ago
haroon amjad 9ef70a250d translation updates 1 week ago
Sikander Saleem 40ba1bd246 ui improvements 1 week ago
haroon amjad 3fc1302eaf New Flutter App param added 1 week ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
1 week ago
haroon amjad 5feacfaf27 Translation updates 1 week ago
haroon amjad 39af08ddc3 Translation updates 2 weeks ago
haroon amjad e5f24b9c06 updates 2 weeks ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 3ff9628cd3 Translation updates 2 weeks ago
aamir-csol bb72c7f7d6 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
2 weeks ago
aamir-csol 0017c0601b blood donation changes 2 weeks ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago
Sultan khan 1edeff439e notifications page updates 2 weeks ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
2 weeks ago
haroon amjad 87422e8e05 translation updates 2 weeks ago
Sikander Saleem 0b9df1f22b collapsing toolbar behaviour changed as like barq 2 weeks ago
Fatimah.Alshammari 9795276ef9 fixed errors 2 weeks ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 2 weeks ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 2 weeks ago
haroon amjad 96ccb40f36 Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 169215fd7b translation changes 2 weeks ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
2 weeks ago
Fatimah.Alshammari 287e2b9562 fixed QR 2 weeks ago
Sikander Saleem 77a04e637e UI/UX improvements. 2 weeks ago
Sultan khan 8b5c4d7575 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
2 weeks ago
Sultan khan 8c92df8648 contact us page fix 2 weeks ago