 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 |
 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
|
9 months ago |
|
haroon amjad
|
b0708d85d9
|
updates & fixes
|
9 months 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
|
9 months ago |
|
haroon amjad
|
20216cd4ae
|
Merge branch 'master' into haroon_dev
|
9 months 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
|
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 |
|
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
|
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 |
|
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
|
9 months ago |
|
haroon amjad
|
4188365e6d
|
readme update
|
9 months ago |
|
haroon amjad
|
d2deb974b1
|
symptoms merge
|
9 months ago |
|
haroon amjad
|
f48eb631ab
|
Merge branch 'master' into haroon_dev
|
9 months 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
|
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
|
9 months ago |
|
faizatflutter
|
3bdc4e246f
|
refactor
|
9 months ago |
|
haroon amjad
|
9ef70a250d
|
translation updates
|
9 months ago |
|
haroon amjad
|
5b24dadb51
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
Sikander Saleem
|
40ba1bd246
|
ui improvements
|
9 months ago |
|
haroon amjad
|
3fc1302eaf
|
New Flutter App param added
|
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 |
|
Haroon6138
|
838929591a
|
Merge pull request 'haroon_dev' (#162) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/162
|
9 months ago |
|
haroon amjad
|
5feacfaf27
|
Translation updates
|
9 months ago |
|
haroon amjad
|
39af08ddc3
|
Translation updates
|
9 months ago |
|
Haroon6138
|
f026ae1d62
|
Merge pull request 'haroon_dev' (#161) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/161
|
9 months ago |
|
haroon amjad
|
e5f24b9c06
|
updates
|
9 months ago |
|
haroon amjad
|
00475dc100
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
Haroon6138
|
23b92cef41
|
Merge pull request 'dev_sultan' (#160) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/160
|
9 months ago |
|
haroon amjad
|
3ff9628cd3
|
Translation updates
|
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 |
|
aamir-csol
|
0017c0601b
|
blood donation changes
|
9 months ago |
Sultan khan
|
7d8537fae6
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
9 months ago |
|
Sultan khan
|
1edeff439e
|
notifications page updates
|
9 months ago |
|
Haroon6138
|
a1beacc36e
|
Merge pull request 'haroon_dev' (#159) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/159
|
9 months ago |
|
haroon amjad
|
3e6ee8c10c
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/routes/app_routes.dart
|
10 months ago |
|
haroon amjad
|
87422e8e05
|
translation updates
|
10 months ago |
|
Sikander Saleem
|
0b9df1f22b
|
collapsing toolbar behaviour changed as like barq
|
10 months ago |
|
Haroon6138
|
179b86b2b0
|
Merge pull request 'fatima' (#158) from fatima into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/158
|
10 months ago |