Commit Graph

46 Commits (c191d4c0c093be9a9f91c371ecdd4a5e7cceb20c)

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
Sultan khan 3b3046804e upgraded 5 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
haroon amjad 5f3c4b034f Monthly attendance fixes 2 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sikander Saleem 705adbc17e code format monthly attendance 3 years ago
Sikander Saleem 47b712d132 monthly attendance & ticket balance chart fix. 3 years ago
haroon amjad 6a0c488435 translation fix 3 years ago
haroon amjad e8043f6980 Merge branch 'fatima' into 'master'
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!54
3 years ago
haroon amjad c436908d25 updates & fixes 3 years ago
Fatimah Alshammari d849699489 fix issues 3 years ago
Fatimah Alshammari 22ac89e744 fix issues 3 years ago
haroon amjad ea676e19ca JIRA Fixes 3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
Fatimah Alshammari e4db7e0cc2 fix issues 3 years ago
Aamir Muhammad d4b31d4338 Chat Login Api Implementation 3 years ago
haroon amjad 492a1a9736 Merge branch 'master' into development_haroon 3 years ago
Fatimah Alshammari c0f333e14b fix issues 3 years ago
haroon amjad b0b84c572c Last Login Fixes 3 years ago
haroon amjad eb6e503a3d Revert "Updates & fixes"
This reverts commit 1119fa1640.
3 years ago
haroon amjad 1119fa1640 Updates & fixes 3 years ago
Sikander Saleem 8120a69fd3 monthly attendance fixes. 3 years ago
Fatimah Alshammari b7685295d9 fix design issues 3 years ago
Fatimah Alshammari 89058f9e59 Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari 416a33b2fd fix design 3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 3 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 3 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 3 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari b502e038a5 fix issue 3 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 3 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 3 years ago
Fatimah Alshammari 2e5a8e7a6b fix issue. 3 years ago
Fatimah Alshammari 1604cba140 fix translation. 3 years ago
Sikander Saleem 2f013ba1ad lint rules added. 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
Fatimah Alshammari 60db9041a1 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	assets/langs/en-US.json
	lib/ui/profile/contact_details.dart
	lib/ui/profile/personal_info.dart
	pubspec.yaml
3 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 3 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 3 years ago
Fatimah Alshammari b281efe14c fix monthly attendance 3 years ago
Fatimah Alshammari 339b343c4c fix calendar 4 years ago
Fatimah Alshammari 0cd37ce0fa fix calendar 4 years ago