Commit Graph

464 Commits (f28762a5c55127e756490f9bc59cce6ebcf3ff29)

Author SHA1 Message Date
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 6d85227f11 lab order by test 4 months ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 7093a26cb8 selection region arabic handling 4 months ago
taha.alam 27a0632d6d directional padding and alignment 4 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 4 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 4 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 months ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
4 months ago
aamir-csol 1125437a56 family screen & widgets 4 months ago
Sikander Saleem 12cef74f16 splash animation added. 4 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 months ago
haroon amjad 836a72ec22 App directionality changes 4 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 4 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol f9bfc131a8 family screen & widgets 4 months ago
Haroon Amjad 1c2564a1e2 updates 4 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 4 months ago
aamir-csol a79dcad221 family screen & widgets 4 months ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
4 months ago
Sultan khan 5ce7548656 family file work-in-progress 4 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
4 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 4 months ago
Haroon6138 25f0b9d415 Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/49
4 months ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 4 months ago
Haroon6138 2c405aa0c3 Merge pull request 'ui improvement.' (#47) from dev_sikander into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/47
4 months ago
Haroon6138 5e82e02323 Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/48
4 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 4 months ago
haroon amjad 3b5d2d27a4 Updates 4 months ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 0a653a61f2 family file bottomsheet added 4 months ago
taha.alam 4473145c00 on success block added to the hms location block 4 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 4 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem 2584e6cc6e route animation improvement. 4 months ago
Sikander Saleem 99e1036043 ui improvement. 4 months ago
haroon amjad 4f4bef9d6f Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
haroon amjad 2961583414 update 4 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c96081d07c reverse animation time changed to 500ms. 4 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan eafb52ab86 family file work in-progress 4 months ago
haroon amjad 928a056cbc Merge branch 'master' into haroon_dev 4 months ago
Haroon6138 bfdc9752ae Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/45
4 months ago
haroon amjad 5e81ba1ed8 updates 4 months ago
Haroon6138 05500e4cd1 Merge pull request 'drilled the lat and lng parameter form viewmodel to the mapper' (#44) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/44
4 months ago
Sikander Saleem 3267317457 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 4 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 4 months ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 4 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 4 months ago
haroon amjad c191fd0be1 updates 4 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 4 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 4 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 4 months ago
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
4 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 4 months ago
Sultan khan fe36c2a1c1 auto sms 4 months ago
aamir-csol 28a95959e0 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 3ab2546d10 merge fixes 4 months ago
haroon amjad 05cf451181 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
4 months ago
haroon amjad 5de5fc8be9 updates 4 months ago
Haroon6138 2ced674311 Merge pull request 'data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo' (#40) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/40
4 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 4 months ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 71a07eed8e Merge branch 'master' into haroon_dev 4 months ago
taha.alam ea2d2bf40f retaining the old data. 4 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
haroon amjad f9e7c8988a updates 4 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
4 months ago
Sultan khan 286dfaa376 no message 4 months ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
4 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 4 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan fdd5d4cf6d fixes 4 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 4 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 4 months ago
haroon amjad 6f745f3666 calendar implementation contd. 4 months ago
aamir-csol 87830e17ab otp screen 4 months ago
haroon amjad 73f8baa77e Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart
4 months ago
Haroon6138 f15018b0e8 Merge pull request 'validations & otp widget & focus & auto fill' (#32) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/32
4 months ago
haroon amjad 7476c8e55a book appo implementation contd. 4 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 4 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
4 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 4 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 4 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 4 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 4 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 4 months ago
Haroon Amjad b240293064 medical file implementation contd. 4 months ago
haroon amjad 1c39b26fcc Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 151351c0bf medical file updates 4 months ago
aamir-csol 7c8d7b67a9 signup finalize 4 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol 0c58c22ea5 sign 4 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 4 months ago
haroon amjad d87562caf5 updates 4 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
haroon amjad 9fbb8c3418 updates 4 months ago
aamir-csol 70810fa14c signup completed 4 months ago
aamir-csol 2b18e08e64 signup completed 4 months ago
aamir-csol 8c55064158 signup completed 4 months ago
haroon amjad 41ca0e27d9 updates 4 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
haroon amjad 28da6e0a2c updates 4 months ago
Haroon6138 1df5b3abd9 Merge pull request 'dev_sultan' (#26) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/26
4 months ago
Sultan khan 301348518d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan a5f64798e0 login fixes 4 months ago
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 4 months ago
haroon amjad f812dac059 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
haroon amjad 4269e99be9 updates 4 months ago
Haroon6138 4cdcf495ea Merge pull request 'dev_sultan' (#24) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/24
4 months ago
Sikander Saleem f9859036ef ui improvements. 4 months ago
Sikander Saleem 118c6717b1 report and logout actions button added. 4 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 299c0b0e29 login flow complete 4 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
4 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 4 months ago
haroon amjad ccd29f0cf9 updates 4 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 4 months ago
Sultan khan 58d33e2dae Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
4 months ago
Sultan khan 1466b6b71a no message 4 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol cd48d83c07 signup 4 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 4 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
4 months ago
Sultan khan 2a081e30b5 saved login done. 4 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 4 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
4 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 4 months ago
Sultan khan 9f0fb27baf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 4 months ago
Sultan khan b4667f5c94 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol ffb399c704 fixes for signup 4 months ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Sultan khan a199ca040b quick login inprogress 4 months ago
aamir-csol 9b063ba764 fixes for signup 4 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 4 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem d464721733 merge conflict fixed. 4 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 4 months ago
Haroon Amjad 003a161b52 custom chips implemented 4 months ago
haroon amjad f8be788a60 updates & fixes 4 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
4 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 4 months ago
haroon amjad 542de41a82 updates & fixes 4 months ago
haroon amjad 2d0fc11f05 updates 4 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
4 months ago
aamir-csol 484ab56a8e fixes for signup 4 months ago
Sultan khan 7d5b941df3 merged conflict 4 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
Sultan khan ba2c8327fe login flow inprogress 4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 4 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 4 months ago
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
aamir-csol 4e1912048d login flow completion 4 months ago
aamir-csol 52fddc5323 login flow completion 4 months ago
Sultan khan 7919d40f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart
4 months ago
Sultan khan ac17202b7a search lab order updated. 4 months ago
Haroon Amjad 43fa08b8b6 insurance update update 4 months ago
haroon amjad d794787459 updates 4 months ago
faizatflutter b15ddd1713 completed till otp receiving 4 months ago
faizatflutter 36c41d40f8 Merge branch 'master' into faiz_dev 4 months ago
haroon amjad bafeb68950 medical file changes 4 months ago
faizatflutter 26f0ffda2c completed till otp receiving 4 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
4 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
4 months ago
haroon amjad 2d5f2b1deb updates 4 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem d385d0362f merge changes 4 months ago
faizatflutter 923f7d7781 completed till otp receiving 4 months ago
faizatflutter 84804a59a7 completed till otp receiving 4 months ago
Sultan khan 3cafc16d50 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8
4 months ago
aamir-csol c27d7301d9 calender & signup fixes. 4 months ago
Sultan khan 29aae34726 lab search added 4 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 4 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
4 months ago
aamir-csol 3855ba276f calender & signup fixes. 4 months ago
haroon amjad 333b813f90 bottom sheet fixes 4 months ago
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 4 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 4 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 4 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 4 months ago
haroon amjad efb22aec4e prescription details page implemented 4 months ago
aamir-csol e41ffd583d changes 4 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
4 months ago
aamir-csol 0309299f44 changes 4 months ago
faizatflutter 6e05ca15cf adding the login function 4 months ago
Haroon Amjad e8f8f6074c prescription details updates 4 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
4 months ago
aamir-csol 85fac13314 changes 4 months ago
Haroon Amjad cd61d08d49 Merge branch 'dev_sultan' 4 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 4 months ago
Sultan khan 886825a4b9 bottom navigation updated. 4 months ago
faizatflutter 32fadb8ad9 completed login function 4 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 4 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 4 months ago
haroon amjad 4c241b0dac Lab orders implemented 4 months ago
Sultan khan 0de09dd72c no message 4 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
Sultan khan f55d82ddb3 bottom navigation 4 months ago
Haroon Amjad 36c6f0d541 Landing page updates 4 months ago
Haroon Amjad 2b22e17743 android fixes 4 months ago
aamir-csol 7321da67e3 register step 2 & fixes 4 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
4 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 5 months ago
Haroon Amjad a77fc49c68 lab result changes 5 months ago
haroon amjad e044fc8c5e lab implementation contd. 5 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 5 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
5 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 5 months ago
faizatflutter 572fcef0f1 checkUserAuth 5 months ago
aamir-csol d1e1154bdb changes 5 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
5 months ago
aamir-csol 67e580447e changes 5 months ago
haroon amjad 9b1c3fe920 medical file updates 5 months ago
faizatflutter c6a95fe7d7 latest push after master merged 5 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
5 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 5 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 5 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 5 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 5 months ago
aamir-csol 5e292544d7 Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart
5 months ago
faizatflutter 89e9323d9e merged master and updated structure 5 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
5 months ago
faizatflutter c1221e4970 pushed device api 5 months ago
aamir-csol 6f98690929 register & changes 5 months ago
Sultan khan 4e010bb2cf initial commit 5 months ago
aamir-csol 9c52a6122f Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/authantication/login.dart
5 months ago
aamir-csol a4da9db6c3 register & changes 5 months ago
Haroon Amjad 0a39a00df5 Landing page updates 5 months ago
Sultan khan d3aff9f93d updating structure 5 months ago