Commit Graph

227 Commits (flutter_upgrade_with_timesheet_changes)

Author SHA1 Message Date
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 1e9a26e3df missing swipe cont 3 years ago
Sikander Saleem 9cc86751eb missing swipe cont 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Sikander Saleem dadaeed10e dynamic forms cont. 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 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
Sikander Saleem 384aa8d9b4 wokrlist api's added & improvements 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 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 b6670289b1 Dashboard API's 1.2 4 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 4 years ago
Sikander Saleem e3d331a223 loading icon added 4 years ago
tall3at 22a9b3e818 Request and Delegate sheets 4 years ago
Sikander Saleem c6ac45fc3d Merge branch 'master' into development_sikander
# Conflicts:
#	lib/classes/colors.dart
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/landing/dashboard.dart
4 years ago
Sikander Saleem b38f4287b6 today attendance progress added(cont) 4 years ago
tall3at 6138919b01 internal Work List screen 1.0 4 years ago
tall3at b2466122d3 internal Work List screen 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
tall3at 89f6df8c77 basic structure 4 years ago