146 Commits (107846dd82d024a198ffdadd04414cc25e2ddf81)

Author	SHA1	Message	Date
Aamir Muhammad	235dc6b1f4	Merge branch 'master' into development_aamir	3 years ago
Aamir Muhammad	c0ee98b06e	Merge branch 'master' into development_aamir ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart	3 years ago
Aamir Muhammad	6d5b2323ac	Merge branch 'master' into development_aamir ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart	3 years ago
Fatimah Alshammari	79774416b4	Merge branch 'master' into fatima ... # Conflicts: # lib/generated/codegen_loader.g.dart	3 years ago
Fatimah Alshammari	69ded3dc43	fix my request	3 years ago
FaizHashmiCS22	f3623e29dc	Merge branch 'master' into development_faiz ... # Conflicts: # lib/generated/codegen_loader.g.dart	3 years ago
haroon amjad	966fb5e209	Worklist fixes	3 years ago
FaizHashmiCS22	5ed9991428	Added new Intimmation Screens with Lottie	3 years ago
FaizHashmiCS22	3d7b80b8a0	Merge branch 'master' into faiz_cs ... # Conflicts: # lib/generated/codegen_loader.g.dart	3 years ago
FaizHashmiCS22	60e7b5a2a0	Adjusted the font settings	3 years ago
FaizHashmiCS22	3c6e4a725f	Merge branch 'master' into faiz_cs ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/extensions/string_extensions.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/login/login_screen.dart # pubspec.yaml	3 years ago
Fatimah Alshammari	f515c0b39a	Merge branch 'master' into fatima ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart	3 years ago
Fatimah Alshammari	7b4fe5bcbc	fix issues	3 years ago
FaizHashmiCS22	38c7d78db3	Added UI Components for Marathon Module.. WIP	3 years ago
Aamir Muhammad	912ac80707	Chat Fixes	3 years ago
Sikander Saleem	defa8a8adb	redirection added on worklist detail when approve or reject.	3 years ago
FaizHashmiCS22	5c848fec87	Added UI Components for Marathon Module.. WIP	3 years ago
haroon amjad	5b5cc16b90	Advanced Search implemented	3 years ago
Sikander Saleem	200b56a992	improvements	3 years ago
Aamir Muhammad	57ebe40b5d	Merge branch 'master' into development_aamir ... # Conflicts: # lib/ui/landing/dashboard_screen.dart	3 years ago
Sikander Saleem	d61315a5fe	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	f0ec4843b4	end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.	3 years ago
Aamir Muhammad	b190a248bf	Chat Implementation Version 1	3 years ago
devmirza121	0d0832277f	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/work_list/worklist_fragments/detail_fragment.dart # lib/ui/work_list/worklist_fragments/info_fragments.dart # pubspec.yaml	3 years ago
devmirza121	116175efaa	Work list UI Change	3 years ago
Fatimah Alshammari	53dabdd853	Merge branch 'master' into fatima	3 years ago
Fatimah Alshammari	be506fa059	fix issues	3 years ago
Sikander Saleem	95b60181b1	bug fixes	3 years ago
Sikander Saleem	e090b9be0b	Merge branch 'development_mirza' into 'master' ... Login with face and finger fixed See merge request mirza.shafique/mohem_flutter_app!83	3 years ago
devmirza121	8ce3a09375	Login with face and finger fixed	3 years ago
Fatimah Alshammari	07d4aadc4e	added survey screen	3 years ago
Fatimah Alshammari	957c88f58f	fix issues	3 years ago
Fatimah Alshammari	241172b7e7	fix issues	3 years ago
Fatimah Alshammari	b7685295d9	fix design issues	3 years ago
Sikander Saleem	cfe0460ea5	my team issues fixed	3 years ago
Sikander Saleem	8e94d57dae	performance evaluation improvements.	3 years ago
Sikander Saleem	2eedef7c2c	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	7eadd97869	item for sale ui improvements & translation added.	3 years ago
Sultan Khan	70a7108d9c	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/config/routes.dart # lib/models/generic_response_model.dart # lib/ui/landing/widget/app_drawer.dart	3 years ago
Sultan Khan	f3477fb5f3	perforamce page updates	3 years ago
Sikander Saleem	b79edd701c	code improvement & translation added.	3 years ago
Sikander Saleem	2ce3c535d2	Merge branch 'master' into development_sikander ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart	3 years ago
Sikander Saleem	6be8510b86	drawer menu ui changed.	3 years ago
Fatimah Alshammari	907b205d21	added subordinate leave	3 years ago
Sikander Saleem	9314ea0514	Merge branch 'master' into development_sikander ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/models/generic_response_model.dart	3 years ago
Fatimah Alshammari	416a33b2fd	fix design	3 years ago
Sikander Saleem	169a9bcc60	leave balance cont.	3 years ago
Sikander Saleem	1404715425	Vacation rule translation added.	3 years ago
Sikander Saleem	3750f2c904	Vacation rule added complete.	3 years ago
Sultan Khan	39b916bcc8	performance page added	3 years ago
Sultan Khan	ff4a546e5f	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	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	aca788ae26	fix translations	3 years ago
Fatimah Alshammari	57bf34a93a	fix translation.	3 years ago
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
Sultan Khan	06b14394bd	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	e6e150b9e3	address phone numbers	3 years ago
Sikander Saleem	f1c36b5821	monthly pay slip added.	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	4ddd967177	Merge branch 'master' into Fatima ... # Conflicts: # lib/generated/codegen_loader.g.dart # pubspec.yaml	3 years ago
devmirza121	2010e9d6a0	Merge branch 'master' into development_mirza ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/classes/colors.dart # lib/classes/consts.dart # lib/config/routes.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/ui/attendance/monthly_attendance.dart # lib/ui/landing/dashboard.dart # lib/widgets/radio/show_radio.dart # pubspec.yaml	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
devmirza121	a03eb8b11a	Worklist (ITG sikp, Delegats and HR multiple requests)	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
Sultan Khan	b5a5399b95	profile	3 years ago
Fatimah Alshammari	1305e895a1	fix arabic translation	3 years ago
Sultan Khan	fad58931f3	profile	3 years ago
Sultan Khan	74c06203db	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	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
Fatimah Alshammari	b281efe14c	fix monthly attendance	3 years ago
Sikander Saleem	25d020441c	my attendance working cont-1	4 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	4 years ago
Fatimah Alshammari	339b343c4c	fix calendar	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
devmirza121	b898481cf7	Merge branch 'Fatima' into development_mirza ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/extensions/string_extensions.dart # lib/extensions/widget_extensions.dart # lib/generated/codegen_loader.g.dart # lib/ui/landing/dashboard.dart # pubspec.lock # pubspec.yaml	4 years ago
Sikander Saleem	384aa8d9b4	wokrlist api's added & improvements	4 years ago
Fatimah Alshammari	0cd37ce0fa	fix calendar	4 years ago
Sikander Saleem	4b5ab2cd7f	wokrlist api's added & improvements	4 years ago
Sikander Saleem	6b9ea200ad	login flow added.	4 years ago
Sikander Saleem	f1beefbc46	login apis, models & forgot password screen added.	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	f48e09b2d1	forgot password screen added.	4 years ago
tall3at	bf8dce2afd	Work List screen	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
Sikander Saleem	761b5abbab	model improvements	4 years ago