Commit Graph

30 Commits (107846dd82d024a198ffdadd04414cc25e2ddf81)

Author SHA1 Message Date
Sultan khan b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml
4 months ago
Haroon Amjad 6fbc7e33ee Merge branch 'flutter_upgrade_with_timesheet_changes'
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/work_list/itg_fragments/request_detail_fragment.dart
6 months ago
taha.alam 5db63e571a WD: flutter upgraded to 3.27.4 9 months ago
taha.alam 2bdaaf9e16 WD: flutter upgrade fron 3.7 to 3.19.0 1 year ago
Sultan khan c7a4e4023e error code 699 fixes 1 year ago
haroon amjad b760dc44a5 Updates & fixes 3 years ago
Sikander Saleem 86d6b57cbc dynamic list screen items grid view improvements 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Faiz Hashmi 86d25d3ecc Added Privileged logic for Marathon 3 years ago
mirza.shafique ea8fd42abd Otp clear & resend fixed 3 years ago
devmirza121 f06238a93f OTP dialog new design 3 years ago
devmirza121 d8938ba256 improvement 3 years ago
devmirza121 599b8b8f4b Login Flag issue fixed 3 years ago
haroon amjad 20e6a6ddc3 Attendance fixes 3 years ago
haroon amjad b0b84c572c Last Login Fixes 3 years ago
devmirza121 8ce3a09375 Login with face and finger fixed 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
devmirza121 42510259bc Worklist & Wifi attendance 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 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
devmirza121 eb3ddb3d9e NFC Attendance implement 1.3 4 years ago
Sikander Saleem 7027299a48 merge improvements 4 years ago
Sikander Saleem 6b9ea200ad login flow added. 4 years ago
Sikander Saleem 02be1cde49 api structure improvement. 4 years ago
Sikander Saleem f1beefbc46 login apis, models & forgot password screen added. 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