Commit Graph

32 Commits (fbd6ef0cf81daa64744cda9f61a9d91a9dc49d52)

Author SHA1 Message Date
haroon amjad 6f745f3666 calendar implementation contd. 2 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
2 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 2 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 2 months ago
haroon amjad ccd29f0cf9 updates 2 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 2 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
2 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 2 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 2 months ago
aamir-csol 52fddc5323 login flow completion 2 months ago
haroon amjad d794787459 updates 2 months ago
faizatflutter b15ddd1713 completed till otp receiving 2 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
2 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
2 months ago
haroon amjad 2d5f2b1deb updates 2 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem d385d0362f merge changes 2 months ago
aamir-csol 3855ba276f calender & signup fixes. 2 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
2 months ago
faizatflutter 6e05ca15cf adding the login function 2 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
2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
aamir-csol 7321da67e3 register step 2 & fixes 2 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
2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
Haroon Amjad 30fd99d122 android fixes 2 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
2 months ago
Faiz Hashmi 357cf4392e Updated architecture 2 months ago
aamir-csol 4e3ba99280 widgets & fixes 2 months ago
Haroon Amjad 2293db00ea updates 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago