Commit Graph

25 Commits (f329f7030d9019d8b672532ed6c90c47866f5fc7)

Author SHA1 Message Date
Sikander Saleem ce7183a137 merge conflicts fixed. 3 years ago
devmirza121 42510259bc Worklist & Wifi attendance 3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
devmirza121 3fce58b379 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
3 years ago
devmirza121 2887894330 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/login/login_screen.dart
3 years ago
devmirza121 ec845756be Login Issue Fix's 3 years ago
Sikander Saleem 25d020441c my attendance working cont-1 4 years ago
Sikander Saleem 9b5147b565 merge improvements 4 years ago
Sikander Saleem 4817781fe1 Merge branch 'development_mirza' into development_sikander
# Conflicts:
#	lib/provider/dashboard_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
4 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 4 years ago
devmirza121 a4fb526b68 NFC Attendance implement 1.4 4 years ago
Sikander Saleem 384aa8d9b4 wokrlist api's added & improvements 4 years ago
devmirza121 eb3ddb3d9e NFC Attendance implement 1.3 4 years ago
devmirza121 35d683a8ae NFC Attendance implement 1.0 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
devmirza121 48a261d674 Dashboard API's 1.4 4 years ago
Sikander Saleem 4b5ab2cd7f wokrlist api's added & improvements 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 baa7182655 Dashboard API's 1.0 4 years ago
Sikander Saleem e3d331a223 loading icon added 4 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 4 years ago
Sikander Saleem f48e09b2d1 forgot password screen added. 4 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 4 years ago