|  Aamir Muhammad | 9dcbdee156 | Changes On iOS | 2 years ago | 
				
					
						|  Aamir Muhammad | 9dd4456c51 | Merge branch 'master' into development_aamir # Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/ui/landing/itg/its_add_screen_video_image.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml | 3 years ago | 
				
					
						|  Sikander Saleem | 571b8bd7af | itg active directory password change added. | 3 years ago | 
				
					
						|  Aamir Muhammad | b21142e4af | Webrtc Calling | 3 years ago | 
				
					
						|  Faiz Hashmi | 5bb998a8d2 | Merge branch 'master' into faiz_cs # Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart | 3 years ago | 
				
					
						|  Faiz Hashmi | d9749fc402 | Updated NoWinnerFoundDesign and some Logical Up gradations | 3 years ago | 
				
					
						|  haroon amjad | 8a393c1e73 | App update screen implemented | 3 years ago | 
				
					
						|  Faiz Hashmi | 8ae8f6d2fe | Merge branch 'master' into faiz_cs # Conflicts:
#	lib/generated/codegen_loader.g.dart | 3 years ago | 
				
					
						|  Faiz Hashmi | 810920a934 | Pushing after resolving multiple times API calling issue | 3 years ago | 
				
					
						|  haroon amjad | d66f841ca4 | App security implemented, Offers & discounts fixes | 3 years ago | 
				
					
						|  Faiz Hashmi | 96e52abbb9 | Committing before reverting from SignalR to Apis | 3 years ago | 
				
					
						|  Aamir Muhammad | 545c33ee4a | Chat Fixes | 3 years ago | 
				
					
						|  Aamir Muhammad | 55ff08c3f3 | Chat Favorite Screen & Fixes | 3 years ago | 
				
					
						|  Sikander Saleem | 39240b734e | mark attendance counter & ios nfc fixed | 3 years ago | 
				
					
						|  devmirza121 | 937c4c18b5 | Mark Attandence success animation and font settings | 3 years ago | 
				
					
						|  FaizHashmiCS22 | 5ed9991428 | Added new Intimmation Screens with Lottie | 3 years ago | 
				
					
						|  FaizHashmiCS22 | 60e7b5a2a0 | Adjusted the font settings | 3 years ago | 
				
					
						|  FaizHashmiCS22 | 5c848fec87 | Added UI Components for Marathon Module.. WIP | 3 years ago | 
				
					
						|  Aamir Muhammad | 57ebe40b5d | Merge branch 'master' into development_aamir # Conflicts:
#	lib/ui/landing/dashboard_screen.dart | 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 | 
				
					
						|  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 | ea2a9c541c | change password screen added. | 3 years ago | 
				
					
						|  Sikander Saleem | 8e94d57dae | performance evaluation improvements. | 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 | 
				
					
						|  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 | 
				
					
						|  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 | 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 | 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 | 028caf1379 | Offers & Discounts implemented | 3 years ago | 
				
					
						|  Sikander Saleem | 169a9bcc60 | leave balance cont. | 3 years ago | 
				
					
						|  haroon amjad | a855e535cd | Item for sale implemented | 3 years ago | 
				
					
						|  Sikander Saleem | fc6b923fc4 | mowadhafhi 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 | 20f7d98ce5 | profile improvements | 3 years ago | 
				
					
						|  Sikander Saleem | 18084ce29f | services menu structure improvements. | 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 | 
				
					
						|  Sultan Khan | ff4a546e5f | Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan | 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 | 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 | 
				
					
						|  Sultan Khan | b10e6184d6 | Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan | 3 years ago | 
				
					
						|  Sultan Khan | 06b14394bd | Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan | 3 years ago |