80 Commits (Main_App_Replacement)

Author	SHA1	Message	Date
Sikander Saleem	f9859036ef	ui improvements.	11 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	11 months ago
Sikander Saleem	cb4601050c	prescription reminder bottom sheet added.	11 months ago
Sultan khan	ba2c8327fe	login flow inprogress	11 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	12 months ago
haroon amjad	efb22aec4e	prescription details page implemented	12 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	12 months ago
aamir-csol	85fac13314	changes	12 months ago
haroon amjad	712e11c69a	prescription details page implementation contd.	12 months ago
haroon amjad	8bc49929d4	prescription orders list page implemented	12 months ago
Sultan khan	39c284d036	Merge remote-tracking branch 'origin/master' into dev_sultan ... # Conflicts: # lib/presentation/home/landing_page.dart	12 months ago
Sultan khan	f55d82ddb3	bottom navigation	12 months ago
Haroon Amjad	36c6f0d541	Landing page updates	12 months ago
aamir-csol	7321da67e3	register step 2 & fixes	12 months ago
aamir-csol	ed24365eff	Merge branch 'master' into dev_aamir ... # Conflicts: # lib/presentation/home/landing_page.dart # lib/theme/colors.dart	12 months ago
haroon amjad	e044fc8c5e	lab implementation contd.	12 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	12 months ago
aamir-csol	67e580447e	changes	12 months ago
faizatflutter	1af571705a	Merge branch 'master' into faiz_dev1 ... # Conflicts: # lib/core/utils/utils.dart # lib/presentation/home/landing_page.dart	12 months ago
haroon amjad	4ecbcb9332	Homepage & medical implementation contd.	12 months ago
aamir-csol	8f1e4500cc	register & Exception bottom sheet, country dropdown.	12 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	12 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	12 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	12 months ago
Haroon Amjad	0a39a00df5	Landing page updates	12 months ago
Sultan khan	d3aff9f93d	updating structure	12 months ago
aamir-csol	ea15bd9152	bottom sheet	12 months ago
aamir-csol	4d76b34608	app bar & chip	12 months ago
aamir-csol	4e3ba99280	widgets & fixes	12 months ago
Haroon Amjad	b6766654e0	initial commit	12 months ago