Commit Graph

17 Commits (b898481cf71e9ea99054b09acc30dfc074ec2ba8)

Author SHA1 Message Date
devmirza121 b898481cf7 Merge branch 'Fatima' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/extensions/widget_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart
#	pubspec.lock
#	pubspec.yaml
4 years ago
devmirza121 a4fb526b68 NFC Attendance implement 1.4 4 years ago
Fatimah Alshammari 0cd37ce0fa fix calendar 4 years ago
devmirza121 eb3ddb3d9e NFC Attendance implement 1.3 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 4 years ago
devmirza121 681fe7fb38 Merge branch 'master' into development_mirza
# Conflicts:
#	lib/ui/login/login_screen.dart
4 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 4 years ago
devmirza121 c4b7046a90 Dashboard API's 1.3 4 years ago
devmirza121 b6670289b1 Dashboard API's 1.2 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago
devmirza121 baa7182655 Dashboard API's 1.0 4 years ago
devmirza121 a109a0529f Merge branch 'master' into development_mirza 4 years ago
devmirza121 c2ced77bca shimmer 4 years ago
Sikander Saleem bf08417bfa login apis and models added. 4 years ago
tall3at 22a9b3e818 Request and Delegate sheets 4 years ago
Sikander Saleem cbe471c7b0 improvements 4 years ago
Sikander Saleem b38f4287b6 today attendance progress added(cont) 4 years ago