17 Commits (1ef3783fb9491a32437aa54bf7e5960234c5ad2d)

Author	SHA1	Message	Date
Fatimah Alshammari	1ef3783fb9	Merge branch 'master' into Fatima ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/api/profile_api_client.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/landing/widget/app_drawer.dart # lib/ui/profile/delete_familyMember.dart # lib/ui/profile/family_members.dart # lib/ui/profile/phone_numbers.dart # lib/ui/screens/profile/profile_screen.dart	3 years ago
Fatimah Alshammari	30ca1894db	fix issues.	3 years ago
Sikander Saleem	f1c36b5821	monthly pay slip added.	3 years ago
Sikander Saleem	ce7183a137	merge conflicts fixed.	3 years ago
Sikander Saleem	95e2e74fd0	Merge branch 'master' into development_sikander ... # Conflicts: # android/app/src/main/AndroidManifest.xml # assets/langs/en-US.json # lib/config/routes.dart # lib/extensions/string_extensions.dart # lib/generated/codegen_loader.g.dart # lib/main.dart # lib/models/generic_response_model.dart # lib/ui/my_attendance/my_attendance_screen.dart # lib/ui/work_list/worklist_detail_screen.dart	3 years ago
Fatimah Alshammari	15cfc0b9f4	merge conflict fixed	3 years ago
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	3e6fdd2cb5	missing swipe added.	3 years ago
Sikander Saleem	1e9a26e3df	missing swipe cont	3 years ago
Fatimah Alshammari	1305e895a1	fix arabic translation	3 years ago
Sultan Khan	fad58931f3	profile	3 years ago
Sikander Saleem	25d020441c	my attendance working cont-1	4 years ago
Sikander Saleem	807d4b4046	item creation added.	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
Sikander Saleem	4b5ab2cd7f	wokrlist api's added & improvements	4 years ago
Sikander Saleem	9c40878c4a	locale commited	4 years ago