Commit Graph

742 Commits (8740178f8c1864eb1018a64d023eb97d7f0455bf)

Author SHA1 Message Date
haroon amjad 8740178f8c Merge branch 'master' into haroon_dev 9 months ago
haroon amjad cfd0c16738 updates & fixes 9 months ago
aamir-csol 7014ac397e Merge remote-tracking branch 'origin/master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
Haroon Amjad 49542a9112 updates & fixes 9 months ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 9 months ago
Haroon Amjad 537d93915e Zoom SDK fixes 9 months ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem b9350afead ui improvements 9 months ago
aamir-csol 2c2cb8bb99 family file button fix 9 months ago
aamir-csol 8c7f4afe76 family file button fix 9 months ago
Haroon6138 c50f8d63ef Merge pull request 'haroon_dev' (#171) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/171
9 months ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 9 months ago
faizatflutter 9c7cfde5f4 ui improvements 9 months ago
tahaalam f78eb5da67 Wd: Unware clinic bottom sheet shown on appointment page. 9 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 9 months ago
Sikander Saleem 41a4005d41 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
haroon amjad 940ce5ff14 updates 9 months ago
haroon amjad 05e87bbb2e Merge branch 'master' into haroon_dev 9 months ago
haroon amjad ae3ed83dd0 contact us page changes 9 months ago
aamir-csol 0c2fe81c99 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 9 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
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 b0708d85d9 updates & fixes 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 7ead6d79e5 updates 9 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad e4b6360808 Services Page fix 9 months ago
haroon amjad f46f978326 Clinic icons updated 9 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 9 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 9 months ago
haroon amjad d2deb974b1 symptoms merge 9 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f54ce71177 translation changes 9 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 9 months ago
haroon amjad 6faca94b89 updates 9 months ago
haroon amjad 99282f34e3 Added language change option in landing page 9 months ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
9 months ago
faizatflutter 4ceca016bb Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
10 months ago
faizatflutter 3bdc4e246f refactor 10 months ago
haroon amjad 9ef70a250d translation updates 10 months ago
Sikander Saleem 40ba1bd246 ui improvements 10 months ago
haroon amjad 3fc1302eaf New Flutter App param added 10 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
10 months ago
haroon amjad 5feacfaf27 Translation updates 10 months ago
haroon amjad 39af08ddc3 Translation updates 10 months ago
haroon amjad e5f24b9c06 updates 10 months ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 10 months ago