Commit Graph

900 Commits (7014ac397e27d77c14c63a5b369985c8a37ad6a4)
 

Author SHA1 Message Date
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
5 days ago
Haroon6138 63cdced84e Merge pull request 'haroon_dev' (#175) from haroon_dev into master
Reviewed-on: #175
5 days ago
Haroon Amjad 49542a9112 updates & fixes 5 days ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 5 days ago
Haroon6138 7f8b2979e7 Merge pull request 'dev_sikander' (#174) from dev_sikander into master
Reviewed-on: #174
5 days ago
Haroon Amjad 537d93915e Zoom SDK fixes 5 days ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 6 days ago
Sikander Saleem b9350afead ui improvements 6 days ago
aamir-csol 2c2cb8bb99 family file button fix 6 days ago
aamir-csol 8c7f4afe76 family file button fix 6 days 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
7 days ago
Haroon6138 118da8da36 Merge pull request 'Wd: Unware clinic bottom sheet shown on appointment page.' (#170) from unware-clinic-bottomsheet into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/170
7 days ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 7 days ago
faizatflutter 9c7cfde5f4 ui improvements 7 days ago
tahaalam f78eb5da67 Wd: Unware clinic bottom sheet shown on appointment page. 7 days ago
Sikander Saleem 6e1eb0d0bb ui improvements 7 days ago
Sikander Saleem 41a4005d41 Merge branch 'refs/heads/master' into dev_sikander 7 days ago
haroon amjad 940ce5ff14 updates 7 days ago
haroon amjad 05e87bbb2e Merge branch 'master' into haroon_dev 1 week ago
haroon amjad ae3ed83dd0 contact us page changes 1 week ago
Haroon6138 245b66150f Merge pull request 'dev_aamir' (#169) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/169
1 week ago
aamir-csol 0c2fe81c99 Merge branch 'master' into dev_aamir 1 week ago
aamir-csol bb4719bd87 logout & family file fix & PMA-1047 1 week ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
2 weeks 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
2 weeks ago
Haroon6138 cd4fbb1905 Merge pull request 'updates & fixes' (#168) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/168
2 weeks ago
haroon amjad b0708d85d9 updates & fixes 2 weeks ago
Haroon6138 37909feb50 Merge pull request 'haroon_dev' (#167) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/167
2 weeks ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 2 weeks ago
Haroon6138 22c388da23 Merge pull request 'dev_aamir' (#166) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/166
2 weeks ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
2 weeks ago
aamir-csol 8b701255ed logout & family file fix 2 weeks ago
haroon amjad 7ead6d79e5 updates 2 weeks ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 2 weeks ago
Haroon6138 cf7ff4ce1d Merge pull request 'Added Arabic Support for symptoms checker (faiz_dev)' (#165) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/165
2 weeks ago
haroon amjad e4b6360808 Services Page fix 2 weeks ago
haroon amjad f46f978326 Clinic icons updated 2 weeks ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 2 weeks ago
haroon amjad 10a5a6f558 Ask Doctor implemented 2 weeks ago
Haroon6138 e8ca8b42bf Merge pull request 'haroon_dev' (#164) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/164
2 weeks ago
haroon amjad 4188365e6d readme update 2 weeks ago
haroon amjad d2deb974b1 symptoms merge 2 weeks ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 2 weeks ago
Haroon6138 b6c665cbf1 Merge pull request 'Symptoms Checker Module (faiz_dev)' (#163) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/163
2 weeks ago
haroon amjad f54ce71177 translation changes 2 weeks ago
faizatflutter 07447e148b Symptoms Checker flow is completed 2 weeks ago
haroon amjad 6faca94b89 updates 2 weeks ago
haroon amjad 99282f34e3 Added language change option in landing page 2 weeks ago
aamir-csol 418297b6fb Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
2 weeks ago
faizatflutter 4ceca016bb Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	pubspec.lock
2 weeks ago