Commit Graph

14 Commits (e87fdafd6258224949ab7a9bc9a8e6da3176b136)

Author SHA1 Message Date
tahaalam e87fdafd62 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/mapbox_access_token.xml
#	android/build/reports/problems/problems-report.html
#	android/settings.gradle.kts
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/tele_consultation/zoom/call_screen.dart
#	lib/routes/app_routes.dart
#	lib/splashPage.dart
#	pubspec.lock
4 weeks ago
tahaalam a812491451 live activity firebase handling 4 weeks ago
tahaalam 1f852f63cf penguin sdk added 3 months ago
faizatflutter 26f0ffda2c completed till otp receiving 5 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
5 months ago
faizatflutter 6e05ca15cf adding the login function 5 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 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
Haroon Amjad 0a39a00df5 Landing page updates 5 months ago
Sultan khan d3aff9f93d updating structure 5 months ago
Haroon Amjad 30fd99d122 android fixes 5 months ago
aamir-csol 4e3ba99280 widgets & fixes 5 months ago
Haroon Amjad b6766654e0 initial commit 5 months ago