Commit Graph

14 Commits (13150321d45083e7d8b982f0fc0e29e6cb500fc6)

Author SHA1 Message Date
Fatimah Alshammari 0e560558dc Merge branch 'master' into Fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml
4 years ago
Fatimah Alshammari 0cd37ce0fa fix calendar 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 4 years ago
devmirza121 48a261d674 Dashboard API's 1.4 4 years ago
Sikander Saleem e7a67cc58d Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	pubspec.yaml
4 years ago
Sikander Saleem 6b9ea200ad login flow added. 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago
devmirza121 c2ced77bca shimmer 4 years ago
Sikander Saleem 78ca9e2c70 icons added & dashboard ui 4 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 4 years ago
Sikander Saleem 761b5abbab model improvements 4 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 4 years ago
tall3at 89f6df8c77 basic structure 4 years ago
tall3at 1b6ebc67c3 first commit 4 years ago