895 Commits (cca95cee6a65146e2021d327e9a3b6e90ce5f6dd)

Author	SHA1	Message	Date
Aamir Muhammad	545c33ee4a	Chat Fixes	3 years ago
haroon amjad	ff0c1e1efc	Merge branch 'master' into development_haroon	3 years ago
Aamir Muhammad	d99bc6e206	Merge branch 'master' into development_aamir ... # Conflicts: # lib/classes/consts.dart	3 years ago
Sikander Saleem	7f2aa4415d	improvement.	3 years ago
Sikander Saleem	ccb89584e2	chat structure issues.	3 years ago
Aamir Muhammad	fa36cd7ddf	Advertisement Image/ Video Module	3 years ago
Sikander Saleem	ce0de886c6	Merge branch 'master' into development_sikander ... # Conflicts: # lib/classes/consts.dart # lib/provider/chat_provider_model.dart # lib/ui/chat/chat_detailed_screen.dart	3 years ago
Sikander Saleem	8018120c6a	chat structure issues.	3 years ago
Aamir Muhammad	bdc00e39d9	Merge branch 'master' into development_aamir	3 years ago
Aamir Muhammad	fa7e08c215	Advertisement Image/ Video Module	3 years ago
Faiz Hashmi	192647031a	Merge branch 'master' into faiz_cs	3 years ago
Aamir Muhammad	db3e1427c5	Advertisement Image/ Video Module	3 years ago
Sikander Saleem	cd45330243	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	ef723fe468	self user checks added while delegate	3 years ago
Faiz Hashmi	cbe251829f	Added HubConnection Code	3 years ago
haroon amjad	6a0c488435	translation fix	3 years ago
Fatimah Alshammari	8169936bc0	fix issues	3 years ago
Aamir Muhammad	ed15ce92b6	Chat Updates & Stability	3 years ago
Aamir Muhammad	68ebecf98a	Chat Updates & Stability	3 years ago
Aamir Muhammad	eb7e5a4837	Chat Updates & Stability	3 years ago
Faiz Hashmi	790cb727e9	Merge branch 'master' into faiz_cs ... # Conflicts: # lib/classes/consts.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/login/login_screen.dart	3 years ago
Faiz Hashmi	35a4b780a7	Added initial APIs for Marathon	3 years ago
Aamir Muhammad	dc9d1715d9	Chat Updates & Counter Event Modifications	3 years ago
Aamir Muhammad	622404896c	Chat Updates & Counter Event Modifications	3 years ago
Aamir Muhammad	f4f9b442c8	Chat Updates & Counter Event Modifications	3 years ago
Sultan khan	557a4c3737	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
Sultan khan	bcf4a9ec42	my team probation issue fixed	3 years ago
haroon amjad	c1527f5f0a	Merge branch 'master' into development_haroon	3 years ago
Aamir Muhammad	2e88275285	Chat Updates & Counter Event Modifications	3 years ago
haroon amjad	42d2de2ec8	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	468555046b	updates	3 years ago
haroon amjad	fe36f12413	Merge branch 'development_aamir' into 'master' ... Chat Updates & Counter Event Modifications See merge request Cloud_Solution/mohemm-flutter-app!61	3 years ago
Sultan khan	ee553ae476	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
Sultan khan	aadc7203a6	no message	3 years ago
haroon amjad	e8043f6980	Merge branch 'fatima' into 'master' ... Fatima See merge request Cloud_Solution/mohemm-flutter-app!54	3 years ago
Fatimah Alshammari	ba1a5c66ef	fix issues	3 years ago
Aamir Muhammad	86ac29946f	Chat Updates & Counter Event Modifications	3 years ago
haroon amjad	1ec45c35aa	Merge branch 'master' into development_haroon ... # Conflicts: # lib/ui/landing/dashboard_screen.dart	3 years ago
haroon amjad	4f88f30368	updates	3 years ago
Aamir Muhammad	5708c93ae5	Chat Updates	3 years ago
Aamir Muhammad	a64ae80a4a	Chat Updates	3 years ago
Aamir Muhammad	06e7a913da	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
haroon amjad	03c488c663	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/consts.dart # lib/widgets/app_bar_widget.dart	3 years ago
Aamir Muhammad	8cb5d9a061	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
Sikander Saleem	c6cd550dbc	Chat Fixes	3 years ago
Sikander Saleem	3cac5eebbc	Chat Fixes	3 years ago
Sikander Saleem	33609ea773	Chat Fixes	3 years ago
Aamir Muhammad	44d76f0687	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
Aamir Muhammad	d7c0ef7bfb	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
Aamir Muhammad	00dee97bca	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
Aamir Muhammad	68939f6256	Chat Call UI	3 years ago
haroon amjad	dd0d4b82a3	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/consts.dart	3 years ago
Aamir Muhammad	bb583def64	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	ab6f265ef4	Chat Favorite Screen & Fixes	3 years ago
Sikander Saleem	55187f4e36	Chat Fixes	3 years ago
Sikander Saleem	7c00f7dce8	Chat Fixes	3 years ago
haroon amjad	80e18911b7	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/consts.dart	3 years ago
haroon amjad	c436908d25	updates & fixes	3 years ago
Aamir Muhammad	ae917a4154	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	c190fbf5ca	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	670a5fbc03	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	fb54403584	Chat Favorite Screen & Fixes	3 years ago
Sikander Saleem	b8e20633c9	Chat Fixes	3 years ago
Aamir Muhammad	4433f538b7	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	b18ebf7a54	Chat Favorite Screen & Fixes	3 years ago
Sikander Saleem	29626ea408	Chat Fixes	3 years ago
Fatimah Alshammari	034d840cec	Merge branch 'master' into fatima	3 years ago
Fatimah Alshammari	d849699489	fix issues	3 years ago
Sikander Saleem	f1aadf5031	Chat Fixes	3 years ago
Sikander Saleem	2934203b8b	Chat Fixes	3 years ago
Sikander Saleem	2fe41977d8	Chat Fixes	3 years ago
haroon amjad	4ff3a5093b	Action duration implemented	3 years ago
Sikander Saleem	93e7f7c862	Chat Fixes	3 years ago
Aamir Muhammad	3e5ce90c9a	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	83aabd0555	Chat Favorite Screen & Fixes	3 years ago
Aamir Muhammad	5412dcaf35	Chat Favorite Screen & Fixes	3 years ago
haroon amjad	cffe185cda	ITG Count fixes	3 years ago
Aamir Muhammad	ca4c9584b9	Merge branch 'master' into development_aamir ... # Conflicts: # lib/classes/consts.dart	3 years ago
Aamir Muhammad	55ff08c3f3	Chat Favorite Screen & Fixes	3 years ago
haroon amjad	c7928d61af	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	c2a4df89bb	offers & discouts	3 years ago
mirza.shafique	ea8fd42abd	Otp clear & resend fixed	3 years ago
haroon amjad	7fc80367d0	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/consts.dart	3 years ago
haroon amjad	6fe015d104	fixes	3 years ago
Aamir Muhammad	ee0e774611	Merge branch 'master' into development_aamir ... # Conflicts: # lib/classes/colors.dart # lib/classes/consts.dart	3 years ago
Aamir Muhammad	67f4fdef28	Chat Fixes & Favorite Api Implementation	3 years ago
Aamir Muhammad	8ba3dcf43b	Chat Fixes & Favorite Api Implementation	3 years ago
haroon amjad	c22556d9b6	fixes	3 years ago
haroon amjad	e826f5048c	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	4d0d3a980e	Item history updated	3 years ago
Fatimah Alshammari	9ecdd6b11d	Merge branch 'master' into fatima ... # Conflicts: # lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart	3 years ago
Fatimah Alshammari	22ac89e744	fix issues	3 years ago
haroon amjad	8ee2c6d974	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	3be279d571	Worklist images added	3 years ago
Sultan khan	89812c0f72	Worklist changes	3 years ago
Sultan khan	5cd0ff1567	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
haroon amjad	2fdde18b52	Merge branch 'faiz_cs' into 'master' ... Updated Banner Again :D See merge request Cloud_Solution/mohemm-flutter-app!49	3 years ago
Sultan khan	4b79c6eda3	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
haroon amjad	21d396b3bb	Worklist updates	3 years ago
Sultan khan	b9f9c31f01	lynx access issue fixed	3 years ago
Sultan khan	c7d2b0aa8a	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
FaizHashmiCS22	9bdb6bfb71	Updated Banner Again :D	3 years ago
haroon amjad	37ff4db9f6	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	26ddc00048	Updates & fixes	3 years ago
Sultan khan	e9edc80eae	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
Sultan khan	a0201efbfb	dynamic screen updated	3 years ago
Fatimah Alshammari	965edf9141	fix issues	3 years ago
Fatimah Alshammari	53fb8605d8	Merge branch 'master' into fatima ... # Conflicts: # lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart	3 years ago
Fatimah Alshammari	c83f0c1199	fix issues	3 years ago
haroon amjad	b834c52b5f	Updated Profile screen	3 years ago
haroon amjad	0051d8b97e	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	00e81999de	Merge branch 'faiz_cs' into 'master' ... Updated Banner Design and Success tone on Lottiee See merge request Cloud_Solution/mohemm-flutter-app!46	3 years ago
haroon amjad	28a882a2f6	Updates & Fixes	3 years ago
FaizHashmiCS22	034436425a	Added success tone	3 years ago
FaizHashmiCS22	fe8c6f9060	Updated Marathon Banner Design	3 years ago
haroon amjad	868728b876	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	3e69880ddd	Merge branch 'faiz_cs' into 'master' ... Position Widget Fixed See merge request Cloud_Solution/mohemm-flutter-app!45	3 years ago
haroon amjad	c0e7bc7c7d	Last Login fixes	3 years ago
FaizHashmiCS22	8f088c78da	Position Fix	3 years ago
haroon amjad	221bf28ddd	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	ea676e19ca	JIRA Fixes	3 years ago
haroon amjad	54b9595add	Merge branch 'faiz_cs' into 'master' ... UI Fixes See merge request Cloud_Solution/mohemm-flutter-app!43	3 years ago
FaizHashmiCS22	bdb8de15e3	Merge branch 'master' into development_faiz	3 years ago
FaizHashmiCS22	09b2f8a23f	UI Fixes	3 years ago
haroon amjad	7cc110b9a1	JIRA fixes	3 years ago
Fatimah Alshammari	0a0c173331	Merge branch 'master' into fatima	3 years ago
Fatimah Alshammari	0cca8ec935	fix issues	3 years ago
mirza.shafique	e9de5c340b	Merge branch 'master' into development_mirza ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart	3 years ago
devmirza121	f06238a93f	OTP dialog new design	3 years ago
Aamir Muhammad	235dc6b1f4	Merge branch 'master' into development_aamir	3 years ago
Aamir Muhammad	7408e24245	Chat Delivered&Seen Event Added.	3 years ago
haroon amjad	d1652ef04d	Merge branch 'development_mirza' into 'master' ... attendance file fixed See merge request Cloud_Solution/mohemm-flutter-app!40	3 years ago
Sikander Saleem	e4737f403e	attendance file fixed	3 years ago
haroon amjad	bf802f3d67	Merge branch 'development_mirza' into 'master' ... Development mirza See merge request Cloud_Solution/mohemm-flutter-app!36	3 years ago
haroon amjad	1a2c9d1b15	Merge branch 'fatima' into 'master' ... Fatima See merge request Cloud_Solution/mohemm-flutter-app!37	3 years ago
haroon amjad	ba588cd3a3	Merge branch 'faiz_cs' into 'master' ... Added Answer Selection Status in Marathon See merge request Cloud_Solution/mohemm-flutter-app!38	3 years ago
haroon amjad	d77f9a3362	Worklist fixes	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
FaizHashmiCS22	710ec44293	Merge branch 'master' into development_faiz ... # Conflicts: # lib/ui/login/login_screen.dart # lib/ui/marathon/marathon_screen.dart	3 years ago
FaizHashmiCS22	11e4da6478	Added Answer Selected Status	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
Sikander Saleem	39240b734e	mark attendance counter & ios nfc fixed	3 years ago
Aamir Muhammad	40b9cb9576	Chat Fixes	3 years ago
haroon amjad	c22736dd79	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	c87a00df6a	Jira fixes	3 years ago
haroon amjad	8be8525360	Merge branch 'development_mirza' into 'master' ... mark attendance counter 1.0 See merge request Cloud_Solution/mohemm-flutter-app!35	3 years ago
Sikander Saleem	528b0930c2	mark attendance counter 1.0	3 years ago
FaizHashmiCS22	db174035ca	Icons updated	3 years ago
haroon amjad	e1030d73b2	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app	3 years ago
haroon amjad	09d2d9936b	Jira Fixes	3 years ago
devmirza121	937c4c18b5	Mark Attandence success animation and font settings	3 years ago
Sikander Saleem	1cd7cd4d76	issues fixed.	3 years ago
FaizHashmiCS22	f0129399e6	Resolved issue in Release mode	3 years ago
FaizHashmiCS22	f9885fa979	Merge branch 'master' into development_faiz	3 years ago
Sikander Saleem	0a73cced51	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	212f8e6663	worklist & itg counters issue resolved, delegate & request info in itg added.	3 years ago
FaizHashmiCS22	f3623e29dc	Merge branch 'master' into development_faiz ... # Conflicts: # lib/generated/codegen_loader.g.dart	3 years ago
haroon amjad	c1666b7140	Merge branch 'development_haroon' into 'master' ... Development haroon See merge request Cloud_Solution/mohemm-flutter-app!30	3 years ago
haroon amjad	966fb5e209	Worklist fixes	3 years ago
FaizHashmiCS22	199a65a994	Merge branch 'master' into development_faiz	3 years ago
FaizHashmiCS22	5ed9991428	Added new Intimmation Screens with Lottie	3 years ago
Fatimah Alshammari	2d40ede37f	fix issues	3 years ago
Fatimah Alshammari	2002359ff1	fix issues	3 years ago
Fatimah Alshammari	e4db7e0cc2	fix issues	3 years ago
haroon amjad	2704fcd147	PR Fixes	3 years ago
Fatimah Alshammari	7024a6b73a	Merge branch 'master' into fatima	3 years ago
Fatimah Alshammari	e2519b5df2	fix issues	3 years ago
haroon amjad	b2810b53ba	Revert yesterday changes	3 years ago
haroon amjad	588e8f51f0	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	8b0bae0891	Worklist updates	3 years ago
FaizHashmiCS22	3d7b80b8a0	Merge branch 'master' into faiz_cs ... # Conflicts: # lib/generated/codegen_loader.g.dart	3 years ago
FaizHashmiCS22	70eceaf648	Adding interactions	3 years ago
FaizHashmiCS22	60e7b5a2a0	Adjusted the font settings	3 years ago
Fatimah Alshammari	af56d8f71b	fix issues	3 years ago
FaizHashmiCS22	3457136cdc	Updated the Banner calling	3 years ago
FaizHashmiCS22	ab59821428	Merge conflicts resolved	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	0ad9d4dd9e	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	defa8a8adb	redirection added on worklist detail when approve or reject.	3 years ago
haroon amjad	aabc86290a	Language change option added in app drawer	3 years ago
FaizHashmiCS22	5c848fec87	Added UI Components for Marathon Module.. WIP	3 years ago
haroon amjad	27ac98539f	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	4024e5fd3f	updates & fixes	3 years ago
Sikander Saleem	e7d2299b43	improvement.	3 years ago
Sikander Saleem	27b5cbfdf6	Merge branch 'master' into development_sikander ... # Conflicts: # lib/ui/work_list/worklist_detail_screen.dart	3 years ago
Sikander Saleem	0213a7a4ef	worklist api calling delay fixed.	3 years ago
Sikander Saleem	c29d003401	services dynamic list issue fixed on payslip	3 years ago
Aamir Muhammad	a623765510	Merge branch 'master' into development_aamir	3 years ago
haroon amjad	109c0ca0a2	PR PO fixes, Worklist fixes	3 years ago
Aamir Muhammad	d4b31d4338	Chat Login Api Implementation	3 years ago
haroon amjad	8f9fb5eb1d	image fixes	3 years ago
haroon amjad	c8d25c997b	Revert "updates" ... This reverts commit 981fc9f8d207334488189c9051042d3792452592.	3 years ago
haroon amjad	da7929bf3e	updates	3 years ago
Sikander Saleem	eea0df3614	Merge branch 'master' into development_sikander	3 years ago
Aamir Muhammad	a90da83fa5	Merge branch 'master' into development_aamir ... # Conflicts: # lib/api/chat/chat_provider_model.dart	3 years ago
Sikander Saleem	b544273416	improvements	3 years ago
Aamir Muhammad	d24103b872	Chat Login Api Implementation	3 years ago
Sikander Saleem	02aff92726	advance search improvement, approve delegate added.	3 years ago
Sikander Saleem	b429b139c8	Merge branch 'master' into development_sikander ... # Conflicts: # lib/ui/work_list/worklist_detail_screen.dart	3 years ago
haroon amjad	f07167e734	Leave balance fix, Items for sale fix	3 years ago
haroon amjad	847b9df6fc	date fix in dashboard	3 years ago
haroon amjad	5b5cc16b90	Advanced Search implemented	3 years ago
Sikander Saleem	7aa2e0f000	code of conduct, workmen regulations added. & improvement.	3 years ago
haroon amjad	8923b49546	Merge branch 'master' into development_haroon ... # Conflicts: # lib/ui/login/login_screen.dart	3 years ago
haroon amjad	34cb722b96	updates	3 years ago
Sikander Saleem	200b56a992	improvements	3 years ago
Sikander Saleem	d200624ac2	Merge branch 'master' into development_sikander ... # Conflicts: # lib/classes/consts.dart # lib/generated/locale_keys.g.dart # lib/ui/landing/dashboard_screen.dart	3 years ago
Aamir Muhammad	963dcce941	adding chat option on dashboard	3 years ago
Aamir Muhammad	57ebe40b5d	Merge branch 'master' into development_aamir ... # Conflicts: # lib/ui/landing/dashboard_screen.dart	3 years ago
Sikander Saleem	d26b7e0753	worklist improvements	3 years ago
Sikander Saleem	5c5da60b12	Merge branch 'master' into development_sikander	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
Sultan khan	eaae618f25	bug fixes	3 years ago
Sultan khan	b3d76df457	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev	3 years ago
Sultan khan	398880c4ad	bug fixes	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
Sikander Saleem	bf7a18b91c	action colors added. contact details improvement	3 years ago
Sikander Saleem	f36606f603	Merge branch 'master' into development_sikander ... # Conflicts: # lib/ui/work_list/work_list_screen.dart	3 years ago
Sikander Saleem	06810486e3	dynamic list center issue fixed.	3 years ago
Sultan khan	ca3febeccd	Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app	3 years ago
Sultan khan	8d9561b570	COC changes	3 years ago
Sikander Saleem	d6315b0674	fixes.	3 years ago
Sikander Saleem	ba8e272885	pull to refresh added on worklist screen.	3 years ago
Fatimah Alshammari	53dabdd853	Merge branch 'master' into fatima	3 years ago
Fatimah Alshammari	be506fa059	fix issues	3 years ago
Sikander Saleem	ba65fbb79d	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	13e9c5fa21	centering issue in dynamic list view screen fixed.	3 years ago
haroon amjad	e65beebfe8	Merge branch 'master' into development_haroon ... # Conflicts: # lib/ui/landing/dashboard_screen.dart	3 years ago
haroon amjad	866bb8a29e	Pull to refresh, Items for Sale & Offers n Discounts fixes	3 years ago
haroon amjad	4c1927bee5	ITG request flow fixed	3 years ago
haroon amjad	9f74c3c39a	ITG request flow fixed	3 years ago
Sikander Saleem	6cd0c4c358	improvement.	3 years ago
Sikander Saleem	e8c8c225c7	icon direction bug fixes	3 years ago
devmirza121	0fa88555fb	Employee Digital Id Fixed	3 years ago
Sikander Saleem	ef96f9703f	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	95b60181b1	bug fixes	3 years ago
devmirza121	c05b8eee29	Remote Changed	3 years ago
haroon amjad	f6c9b6dce9	Updates & fixes	3 years ago
Sikander Saleem	0c7fbde013	Merge branch 'master' into development_sikander ... # Conflicts: # lib/ui/my_attendance/services_menu_list_screen.dart	3 years ago
Sikander Saleem	9a0131277b	create request by manager in my team, improvements	3 years ago
haroon amjad	dd26452663	Fixes & updates	3 years ago
Sikander Saleem	9ce042e7d3	bussiness card improvement.	3 years ago
haroon amjad	c14bfd22db	Mohemm Android build given to QA	3 years ago
devmirza121	d8938ba256	improvement	3 years ago
devmirza121	599b8b8f4b	Login Flag issue fixed	3 years ago
devmirza121	9412348cde	Merge branch 'master' into development_mirza	3 years ago
haroon amjad	20e6a6ddc3	Attendance fixes	3 years ago
Sikander Saleem	692a105bad	ios fixes-2	3 years ago
haroon amjad	492a1a9736	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	eb29553d26	NFC Fixes	3 years ago
Sikander Saleem	90649a0259	password visible option added.	3 years ago
Fatimah Alshammari	df622d28dc	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	c0f333e14b	fix issues	3 years ago
haroon amjad	b0b84c572c	Last Login 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
Fatimah Alshammari	c664125c8f	fix issues	3 years ago
devmirza121	8ce3a09375	Login with face and finger fixed	3 years ago
Fatimah Alshammari	ff623b12ad	Merge branch 'master' into Fatima ... # Conflicts: # lib/ui/landing/widget/app_drawer.dart	3 years ago
Fatimah Alshammari	07d4aadc4e	added survey screen	3 years ago
Sikander Saleem	20ffb73dd8	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	a45b6aece2	improvements	3 years ago
Sikander Saleem	ea2a9c541c	change password screen added.	3 years ago
Fatimah Alshammari	442f6d8180	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	957c88f58f	fix issues	3 years ago
Sikander Saleem	53bf7d68ed	Merge branch 'Fatima' into 'master' ... Fatima See merge request mirza.shafique/mohem_flutter_app!78	3 years ago
Sikander Saleem	97bd497866	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	4e22784676	ticket balance dashboard added.	3 years ago
Fatimah Alshammari	241172b7e7	fix issues	3 years ago
Fatimah Alshammari	c2142c9997	fix issues	3 years ago
Fatimah Alshammari	48e582af82	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	8fa4670392	fix issues	3 years ago
Sikander Saleem	4b935f1dc5	leave balance dashboard added.	3 years ago
Sikander Saleem	8120a69fd3	monthly attendance fixes.	3 years ago
Fatimah Alshammari	ffba702cf9	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	f3855c3883	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	cbcb3cdc00	item for sale improvement cont.	3 years ago
Fatimah Alshammari	6a1f655b1f	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	3d11273738	fix design issues	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	f647b32c65	item for sale improvement.	3 years ago
Sikander Saleem	b79edd701c	code improvement & translation added.	3 years ago
Fatimah Alshammari	414cc587ea	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	e2720c7057	fix design issues	3 years ago
Fatimah Alshammari	a55e4bf84f	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	83b51ae589	fix design issues	3 years ago
Sikander Saleem	3cd3aaa6d3	Merge branch 'master' into development_sikander ... # Conflicts: # lib/extensions/string_extensions.dart # lib/ui/landing/widget/app_drawer.dart	3 years ago
Sikander Saleem	55cafb5466	improvement.	3 years ago
haroon amjad	fb2924964b	Merge branch 'master' into development_haroon ... # Conflicts: # lib/models/generic_response_model.dart # lib/ui/landing/widget/app_drawer.dart # pubspec.yaml	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	07636bef77	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	907b205d21	added subordinate leave	3 years ago
Sikander Saleem	ee2c74b5da	leave balance submit request added.	3 years ago
Sikander Saleem	cf7843191b	leave balance added.	3 years ago
Fatimah Alshammari	bee1aef03e	Merge branch 'master' into Fatima ... # Conflicts: # lib/models/get_user_item_type_list.dart # lib/models/my_team/get_attendance_tracking_list_model.dart # lib/models/my_team/get_employee_subordinates_list.dart # lib/models/update_item_type_success_list.dart # lib/models/update_user_item_type_list.dart # lib/models/worklist/update_user_type_list.dart # lib/ui/my_team/view_attendance.dart # lib/ui/profile/contact_details.dart	3 years ago
Fatimah Alshammari	d640ce29de	fix issue	3 years ago
Sikander Saleem	2f6e40da46	add leave balance cont.	3 years ago
Sikander Saleem	af170b2b02	missing swipe,ticket balance home screen item linked with corresponding screen.	3 years ago
Sikander Saleem	41a1ba125e	code improvements.	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	89058f9e59	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	416a33b2fd	fix design	3 years ago
haroon amjad	50f203cd55	Updates & fixes	3 years ago
haroon amjad	a05d037211	Merge branch 'master' into development_haroon ... # Conflicts: # lib/classes/colors.dart # lib/extensions/string_extensions.dart # lib/ui/screens/announcements/announcement_details.dart # lib/ui/screens/announcements/announcements.dart # lib/ui/screens/mowadhafhi/mowadhafhi_home.dart # lib/widgets/dynamic_forms/dynamic_textfield_widget.dart	3 years ago
Sikander Saleem	171735202b	leave balance cont3.	3 years ago
Sikander Saleem	2278a1e98f	Merge remote-tracking branch 'origin/development_sikander' into development_sikander ... # Conflicts: # lib/ui/leave_balance/add_leave_balance_screen.dart	3 years ago
Sikander Saleem	d5c8604f32	leave balance cont3.	3 years ago
Sikander Saleem	a14103b859	leave balance cont3.	3 years ago
haroon amjad	7c0589ef32	Announcement details fixes	3 years ago
haroon amjad	52438ce711	offers & discounts implemented	3 years ago
haroon amjad	028caf1379	Offers & Discounts implemented	3 years ago
Sikander Saleem	8855eb7622	leave balance cont2.	3 years ago
Sikander Saleem	169a9bcc60	leave balance cont.	3 years ago
Sikander Saleem	c0ec2260e5	mark attendance improvement.	3 years ago
Sikander Saleem	d6cc5fcc6c	pending transaction.	3 years ago
haroon amjad	a855e535cd	Item for sale implemented	3 years ago
Sikander Saleem	fc6b923fc4	mowadhafhi improvement.	3 years ago
Fatimah Alshammari	8aa14618d4	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima	3 years ago
Sikander Saleem	9b50c2cf31	mark attendance improvement.	3 years ago
Fatimah Alshammari	dc880df35a	Merge branch 'master' into Fatima ... # Conflicts: # lib/config/routes.dart # lib/models/generic_response_model.dart # lib/models/profile_menu.model.dart	3 years ago
Fatimah Alshammari	a22f679908	my team module and workList settings	3 years ago
Sikander Saleem	8247032a52	profile options linked with home page personal information.	3 years ago
Sikander Saleem	20f7d98ce5	profile improvements	3 years ago
Sikander Saleem	11bd7a7085	improvements.	3 years ago
Sikander Saleem	18084ce29f	services menu structure improvements.	3 years ago
Sikander Saleem	1404715425	Vacation rule translation added.	3 years ago
Sikander Saleem	3750f2c904	Vacation rule added complete.	3 years ago
haroon amjad	40cdaca0ef	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	5c15d07dc8	updates	3 years ago
Sikander Saleem	4edb19c2bb	Vacation rule added cont.	3 years ago
Sikander Saleem	55f1f792f9	Merge branch 'master' into development_sikander ... # Conflicts: # lib/models/profile_menu.model.dart	3 years ago
Sikander Saleem	3fcbd9946a	configs for ios.	3 years ago
Sultan Khan	39b916bcc8	performance page added	3 years ago
haroon amjad	1719c7029e	Merge branch 'master' into development_haroon ... # Conflicts: # lib/config/routes.dart # lib/models/generic_response_model.dart # lib/ui/landing/widget/app_drawer.dart # lib/ui/screens/announcements/announcement_details.dart # pubspec.yaml	3 years ago
haroon amjad	c63844dcf7	My requests & CCP	3 years ago
Fatimah Alshammari	0820f87877	Merge branch 'master' into Fatima	3 years ago
Fatimah Alshammari	d1cc9bd468	fix issue	3 years ago
Sikander Saleem	fabb847fd8	Merge branch 'development_sultan' into 'master' ... Development sultan See merge request mirza.shafique/mohem_flutter_app!49	3 years ago
Sultan Khan	ff4a546e5f	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	1137e585e3	update button check	3 years ago
Fatimah Alshammari	058e287b25	fix translation	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
Sikander Saleem	04520250a5	badge on work list in bottom navigation bar.	3 years ago
Sikander Saleem	68146ecd97	dynamic forms finalized & improvements	3 years ago
Sikander Saleem	48de28c0b3	Merge branch 'master' into development_sikander	3 years ago
Fatimah Alshammari	aca788ae26	fix translations	3 years ago
Fatimah Alshammari	2e5a8e7a6b	fix issue.	3 years ago
Sikander Saleem	c390d87fca	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	d5b1512eb4	improvements	3 years ago
devmirza121	7ca9096d89	Merge issue 2.0	3 years ago
devmirza121	8fe51a654c	Merge branch 'master' into development_mirza ... # Conflicts: # lib/extensions/string_extensions.dart # lib/main.dart # lib/ui/landing/today_attendance_screen.dart # lib/ui/landing/widget/app_drawer.dart # pubspec.yaml	3 years ago
devmirza121	4dc4a3fafb	Merge issue 1.0	3 years ago
Fatimah Alshammari	1604cba140	fix translation.	3 years ago
Sultan Khan	2b93d43380	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Fatimah Alshammari	57bf34a93a	fix translation.	3 years ago
Sultan Khan	3c777d220e	basic details	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
Sikander Saleem	0b2a87aaaf	dynamic forms logic improvement.	3 years ago
Fatimah Alshammari	d74d8ff369	fixed footer design.	3 years ago
Sultan Khan	b10e6184d6	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	26bbff6844	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Fatimah Alshammari	23110b792f	completed add and update family member	3 years ago
devmirza121	2ced8313da	QR, Digital Card & Employee ID Implementation	3 years ago
Sikander Saleem	2f013ba1ad	lint rules added.	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	0786a1fa03	lint rules added.	3 years ago
Sikander Saleem	2966ca129c	monthly pay slip improvement	3 years ago
Sikander Saleem	f1c36b5821	monthly pay slip added.	3 years ago
Fatimah Alshammari	a4ca7433a4	add and update family member in progress	3 years ago
haroon amjad	6d1b942dca	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	d614532956	Announcements implemented	3 years ago
Sikander Saleem	2adb1e34bf	Merge branch 'development_haroon' into 'master' ... Development haroon See merge request mirza.shafique/mohem_flutter_app!35	3 years ago
haroon amjad	e045374703	Not found svg added, Pending transactions, Announcements.	3 years ago
Sikander Saleem	e01bb920a7	Merge branch 'development_haroon' into 'master' ... Pending Transactions implemented See merge request mirza.shafique/mohem_flutter_app!34	3 years ago
haroon amjad	427c5fb5b6	Pending Transactions implemented	3 years ago
Fatimah Alshammari	17ca565f4c	Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima ... Conflicts: lib/api/profile_api_client.dart	3 years ago
Fatimah Alshammari	c3945d2583	family member in progress	3 years ago
Sultan Khan	9b213dc9ab	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	ea5178fe20	profle dynamic forms	3 years ago
Sikander Saleem	4c18f038e5	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	cb88f12ced	return from leave done.	3 years ago
haroon amjad	12225d8a25	Merge branch 'master' into development_haroon	3 years ago
haroon amjad	9e8bc47f7e	Mowadhafhi request completed	3 years ago
Sikander Saleem	42e93e42a9	merge issue fixed	3 years ago
haroon amjad	cf523566cd	Mowadhafi home & details page done	3 years ago
Sultan Khan	f329f7030d	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	23326a769a	PHONE NUMBERS	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	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	fd07de072c	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima ... Conflicts: lib/main.dart lib/ui/profile/contact_details.dart	3 years ago
Fatimah Alshammari	7be1bdcdc2	fix family member	3 years ago
Sikander Saleem	959750da9b	ticket request cont.	3 years ago
devmirza121	42510259bc	Worklist & Wifi attendance	3 years ago
Sultan Khan	794cd2b1e8	phone number inprogress	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	88d2e05ae7	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	91a67638c4	phone number inprogress	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	cee80111fc	for comment	3 years ago
Sikander Saleem	1e9a26e3df	missing swipe cont	3 years ago
Sultan Khan	979879a286	phone number is progress	3 years ago
Sikander Saleem	c4096bd44d	improvements	3 years ago
Sikander Saleem	9cc86751eb	missing swipe cont	3 years ago
Sultan Khan	8f80bbb9db	profile dynamic forms	3 years ago
Sultan Khan	b5a5399b95	profile	3 years ago
Sultan Khan	13150321d4	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sikander Saleem	dadaeed10e	dynamic forms cont.	3 years ago
Fatimah Alshammari	1305e895a1	fix arabic translation	3 years ago
Sultan Khan	f8651ab49a	app bar	3 years ago
Sultan Khan	a0ccacf078	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	fad58931f3	profile	3 years ago
Fatimah Alshammari	44c9a090f9	fix personal details	3 years ago
Sultan Khan	57f789ca6d	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Fatimah Alshammari	6529c2aeba	profile pages	3 years ago
Sultan Khan	74c06203db	Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	3 years ago
Sultan Khan	6e86c0ba38	profile details	3 years ago
Fatimah Alshammari	393e28b32c	fix profile	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
devmirza121	ec845756be	Login Issue Fix's	3 years ago
Fatimah Alshammari	b281efe14c	fix monthly attendance	3 years ago
Sultan Khan	82570b9ba6	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	4 years ago
Sultan Khan	49bc689351	Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	4 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