76 Commits (86fa198afc4d263453fbb64e2f02eb89b206c310)

Author	SHA1	Message	Date
haroon amjad	86fa198afc	Updates & fixes	6 months ago
haroon amjad	56f5151c0c	Font changes, Updates & fixes	6 months ago
haroon amjad	a8620c1f72	updates	6 months ago
haroon amjad	a13d0cf0e4	updates	6 months ago
haroon amjad	837a934d0d	updates	7 months ago
tahaalam	151fcf23d1	Merge remote-tracking branch 'origin/master' into watch_integration ... # Conflicts: # android/app/build.gradle.kts # android/app/src/main/res/mipmap-hdpi/ic_launcher.png # android/app/src/main/res/mipmap-mdpi/ic_launcher.png # android/app/src/main/res/mipmap-xhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # android/app/src/main2/res/mipmap-hdpi/ic_launcher.png # android/app/src/main2/res/mipmap-mdpi/ic_launcher.png # android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png # android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png # android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png # android/build/reports/problems/problems-report.html # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart # lib/theme/colors.dart # package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png # package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png # package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png # package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png # package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # pubspec.yaml	7 months ago
haroon amjad	f46b3f745f	Dark mode enabled	7 months ago
haroon amjad	dffed5df6b	Insurance approvals page fixes	8 months ago
tahaalam	3f9046f1e4	Merge remote-tracking branch 'origin/master' into watch_integration ... # Conflicts: # android/app/src/main/AndroidManifest.xml # android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt # assets/langs/ar-SA.json # assets/langs/en-US.json # ios/Runner.xcodeproj/project.pbxproj # lib/core/api_consts.dart # lib/generated/locale_keys.g.dart	8 months ago
tahaalam	bfeb3dce4e	data integration along with the data representation	8 months ago
Haroon Amjad	105ab2326a	updates	8 months ago
haroon amjad	3c9c3032a5	Services price list implemented	8 months ago
haroon amjad	b309342cdc	lab fixes	8 months ago
faizatflutter	9c7cfde5f4	ui improvements	9 months 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	9 months ago
haroon amjad	20216cd4ae	Merge branch 'master' into haroon_dev	9 months ago
aamir-csol	2bbfe1f131	Merge branch 'master' into dev_aamir ... # Conflicts: # lib/presentation/profile_settings/profile_settings.dart	9 months ago
aamir-csol	8b701255ed	logout & family file fix	9 months ago
haroon amjad	e4b6360808	Services Page fix	9 months ago
faizatflutter	07447e148b	Symptoms Checker flow is completed	9 months ago
faizatflutter	4ceca016bb	Merge branch 'master' into faiz_dev ... # Conflicts: # lib/presentation/hmg_services/services_page.dart # pubspec.lock	9 months ago
faizatflutter	3bdc4e246f	refactor	9 months 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	9 months 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	9 months ago
haroon amjad	87422e8e05	translation updates	9 months ago
Sikander Saleem	77a04e637e	UI/UX improvements.	9 months ago
aamir-csol	a816afadea	Merge branch 'master' into dev_aamir ... # Conflicts: # lib/core/dependencies.dart # lib/presentation/hmg_services/services_page.dart	9 months ago
aamir-csol	d76ff5828f	fixes	9 months ago
haroon amjad	609ae6ab83	updates	9 months ago
haroon amjad	344adf23c0	Merge branch 'master' into haroon_dev ... # Conflicts: # lib/core/dependencies.dart # lib/main.dart # lib/presentation/hmg_services/services_page.dart # lib/presentation/home/landing_page.dart	9 months ago
haroon amjad	44ce353dac	updates	9 months ago
Fatimah.Alshammari	250af1506c	Merge branch 'master' into fatima ... # Conflicts: # lib/core/dependencies.dart # lib/presentation/medical_file/medical_file_page.dart # lib/routes/app_routes.dart # lib/services/dialog_service.dart # lib/theme/colors.dart	9 months ago
faizatflutter	ff2bcbae3f	Merge branch 'master' into faiz_dev ... # Conflicts: # lib/core/api_consts.dart # lib/core/dependencies.dart # lib/main.dart	9 months ago
faizatflutter	3f5bd0a759	Completed the health Tracker Module, Only the email part is left.	9 months ago
Fatimah.Alshammari	20e4f82df3	Merge branch 'master' into fatima ... # Conflicts: # lib/core/dependencies.dart # lib/main.dart # lib/presentation/hmg_services/services_page.dart # lib/presentation/medical_file/medical_file_page.dart # lib/routes/app_routes.dart	9 months ago
Fatimah.Alshammari	8ae81d2b24	fixed parking qr	9 months ago
haroon amjad	d6b1744176	updates	9 months ago
haroon amjad	6f067d92d6	My invoices implemented	9 months ago
faizatflutter	57f693e0d9	fixed the suggested design changes. (Not reminder ones)	10 months ago
faizatflutter	460e32d25a	Merge branch 'master' into faiz_dev ... # Conflicts: # lib/presentation/hmg_services/services_page.dart	10 months ago
faizatflutter	a29c0dd6bc	fixed the suggested design changes. (Not reminder ones)	10 months ago
Sultan khan	afe169d2d9	silent login fix	10 months ago
faizatflutter	f8fdd7570e	Merge branch 'master' into faiz_dev ... # Conflicts: # lib/routes/app_routes.dart # lib/theme/colors.dart	10 months ago
Fatimah.Alshammari	11de01e079	Merge branch 'refs/heads/master' into fatima ... # Conflicts: # lib/presentation/hmg_services/services_page.dart # lib/routes/app_routes.dart # lib/theme/colors.dart	10 months ago
Fatimah.Alshammari	62bb667cb8	added parking part	10 months ago
faizatflutter	333046951c	Merge branch 'master' into faiz_dev ... # Conflicts: # lib/core/app_assets.dart # lib/core/dependencies.dart # lib/main.dart # lib/routes/app_routes.dart	10 months ago
Sultan khan	6ceee6973f	Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan ... * 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: sickleave fix Health calculators & converters updates updates updates updates Nearest Appointment selected # Conflicts: # lib/presentation/lab/lab_orders_page.dart	10 months ago
Sultan khan	873b2a1591	sorting done, covid inprogress	10 months ago
haroon amjad	3cc2610d30	updates	10 months ago
Fatimah.Alshammari	f3674ba06f	Merge branch 'refs/heads/master' into fatima ... # Conflicts: # lib/core/dependencies.dart # lib/presentation/hmg_services/services_page.dart # lib/routes/app_routes.dart	10 months ago