Commit Graph

9 Commits (ae0a788728c74b3583ca5d8e9d9f4d5635fbd6f4)

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
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 4 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 4 years ago
Sikander Saleem cbe471c7b0 improvements 4 years ago
Sikander Saleem b38f4287b6 today attendance progress added(cont) 4 years ago
Sikander Saleem f16b3c5c79 dashboard ui added. 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