265 Commits (0b08606813201dc0152331159d6964b8f7f11a32)

Author	SHA1	Message	Date
Faiz Hashmi	2f825151a0	Merge branch 'master' into faiz_cs ... # Conflicts: # lib/classes/consts.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/marathon/marathon_intro_screen.dart # lib/ui/marathon/marathon_provider.dart # lib/ui/marathon/marathon_screen.dart # lib/ui/marathon/marathon_winner_selection.dart # lib/ui/marathon/widgets/question_card.dart # pubspec.yaml	3 years ago
Sikander Saleem	91a0be7974	Merge branch 'master' into development_sikander ... # Conflicts: # lib/classes/consts.dart	3 years ago
Sikander Saleem	7d651c247a	marathon improvements.	3 years ago
Faiz Hashmi	59ad00ca2a	Fetched Questoins and Added Answer Interactivity	3 years ago
Aamir Muhammad	545c33ee4a	Chat Fixes	3 years ago
Aamir Muhammad	fa36cd7ddf	Advertisement Image/ Video Module	3 years ago
Aamir Muhammad	fa7e08c215	Advertisement Image/ Video Module	3 years ago
Aamir Muhammad	db3e1427c5	Advertisement Image/ Video Module	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
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
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	00dee97bca	Chat Count Api / Chat Token Updates / Chat Call UI	3 years ago
haroon amjad	c436908d25	updates & fixes	3 years ago
haroon amjad	c22556d9b6	fixes	3 years ago
haroon amjad	28a882a2f6	Updates & Fixes	3 years ago
haroon amjad	ea676e19ca	JIRA Fixes	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	d77f9a3362	Worklist fixes	3 years ago
Sikander Saleem	39240b734e	mark attendance counter & ios nfc fixed	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
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
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	199a65a994	Merge branch 'master' into development_faiz	3 years ago
haroon amjad	8b0bae0891	Worklist updates	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
FaizHashmiCS22	38c7d78db3	Added UI Components for Marathon Module.. WIP	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	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
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	b429b139c8	Merge branch 'master' into development_sikander ... # Conflicts: # lib/ui/work_list/worklist_detail_screen.dart	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
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
Sikander Saleem	d26b7e0753	worklist improvements	3 years ago
Sultan khan	398880c4ad	bug fixes	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
Sikander Saleem	6cd0c4c358	improvement.	3 years ago
Sikander Saleem	e8c8c225c7	icon direction bug fixes	3 years ago
Sikander Saleem	ef96f9703f	Merge branch 'master' into development_sikander	3 years ago
Sikander Saleem	95b60181b1	bug fixes	3 years ago
haroon amjad	f6c9b6dce9	Updates & fixes	3 years ago
Sikander Saleem	9ce042e7d3	bussiness card improvement.	3 years ago
Sikander Saleem	692a105bad	ios fixes-2	3 years ago
haroon amjad	eb29553d26	NFC Fixes	3 years ago
haroon amjad	b0b84c572c	Last Login Fixes	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	a45b6aece2	improvements	3 years ago
Sikander Saleem	97bd497866	Merge branch 'master' into development_sikander	3 years ago
Fatimah Alshammari	8fa4670392	fix issues	3 years ago
Sikander Saleem	4b935f1dc5	leave balance dashboard added.	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
Sikander Saleem	b79edd701c	code improvement & translation added.	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
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	6be8510b86	drawer menu ui changed.	3 years ago
Sikander Saleem	af170b2b02	missing swipe,ticket balance home screen item linked with corresponding screen.	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
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
haroon amjad	52438ce711	offers & discounts implemented	3 years ago
haroon amjad	028caf1379	Offers & Discounts implemented	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
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	18084ce29f	services menu structure improvements.	3 years ago
haroon amjad	40cdaca0ef	Merge branch 'master' into development_haroon	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	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	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
Fatimah Alshammari	aca788ae26	fix translations	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	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
devmirza121	2ced8313da	QR, Digital Card & Employee ID Implementation	3 years ago
Sikander Saleem	0786a1fa03	lint rules added.	3 years ago
Sikander Saleem	f1c36b5821	monthly pay slip added.	3 years ago
haroon amjad	e045374703	Not found svg added, Pending transactions, Announcements.	3 years ago
haroon amjad	427c5fb5b6	Pending Transactions implemented	3 years ago
haroon amjad	cf523566cd	Mowadhafi home & details page done	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
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
Sikander Saleem	959750da9b	ticket request cont.	3 years ago
devmirza121	42510259bc	Worklist & Wifi attendance	3 years ago
devmirza121	a03eb8b11a	Worklist (ITG sikp, Delegats and HR multiple requests)	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
Sultan Khan	6e86c0ba38	profile details	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
Sultan Khan	82570b9ba6	Merge branch 'master' 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
Sultan Khan	2f395f29df	Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	4 years ago
Sultan Khan	ff17adfd09	Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	4 years ago
Sikander Saleem	9b5147b565	merge improvements	4 years ago
Sultan Khan	06b3726d4a	Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan	4 years ago
Sultan Khan	0974861463	updated menus	4 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	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
devmirza121	a4fb526b68	NFC Attendance implement 1.4	4 years ago
Fatimah Alshammari	0cd37ce0fa	fix calendar	4 years ago