Commit Graph

18 Commits (393e28b32cf9e2f3bf1cdc9b875f54be99f16a33)

Author SHA1 Message Date
Fatimah Alshammari 393e28b32c fix profile 2 years ago
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
2 years ago
Sikander Saleem a431913bb6 purchase order & move order, item history & quotation analysis added. 3 years ago
Fatimah Alshammari 0cd37ce0fa fix calendar 3 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
3 years ago
Sikander Saleem 6b9ea200ad login flow added. 3 years ago
devmirza121 fb8d6c7b20 Dashboard API's 1.1 3 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 3 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
3 years ago
Sikander Saleem b38f4287b6 today attendance progress added(cont) 3 years ago
tall3at b2466122d3 internal Work List screen 3 years ago
Sikander Saleem f48e09b2d1 forgot password screen added. 3 years ago
tall3at bf8dce2afd Work List screen 3 years ago
Sikander Saleem 311ebd9c13 confirm login screen added & structure improvement. 3 years ago
Sikander Saleem 761b5abbab model improvements 3 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 3 years ago
tall3at ac98216630 basic structure 1.0 3 years ago
tall3at 89f6df8c77 basic structure 3 years ago