|  Aamir Muhammad | d651b34381 | Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade # Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml | 3 months ago | 
				
					
						|  Aamir Muhammad | 8d6c3ddc0b | mazaya banner changes | 3 months ago | 
				
					
						|  Aamir Muhammad | f61817937b | tickt booking implementation | 3 months ago | 
				
					
						|  Syed Taha Alam | e50d1f70b2 | upgraded the sdk to 35 | 3 months ago | 
				
					
						|  Aamir Muhammad | cd36d61640 | logins apis | 4 months ago | 
				
					
						|  Sultan khan | b2ffa0c619 | Merge branch 'master' into mohem_flutter_upgrade # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml | 4 months ago | 
				
					
						|  Sultan khan | 3b3046804e | upgraded | 5 months ago | 
				
					
						|  haroon amjad | e91b33805e | fixes & updates, Time sheet changes, Update to stores VersionID 8.7 | 6 months ago | 
				
					
						|  Haroon Amjad | 6fbc7e33ee | Merge branch 'flutter_upgrade_with_timesheet_changes' # Conflicts:
#	lib/classes/consts.dart
#	lib/ui/work_list/itg_fragments/request_detail_fragment.dart | 6 months ago | 
				
					
						|  Aamir Muhammad | 72c178382f | time sheet changes | 6 months ago | 
				
					
						|  Sikander Saleem | 54aa610856 | long text field changed to separate field. | 8 months ago | 
				
					
						|  sultan khan | c26b2d9a5f | search employee inprogress | 8 months ago | 
				
					
						|  taha.alam | 5db63e571a | WD: flutter upgraded to 3.27.4 | 9 months ago | 
				
					
						|  Sikander Saleem | 6e3fc55fde | event activity added - cont | 9 months ago | 
				
					
						|  Sikander Saleem | a33da491f9 | description format section seperated in itg forms | 9 months ago | 
				
					
						|  Sikander Saleem | 4eb3e6d52d | progress bar added on erm video. & skip button relocation. | 11 months ago | 
				
					
						|  haroon amjad | 2682158590 | ERM Channel Video changes | 11 months ago | 
				
					
						|  haroon amjad | b20e0a8c7b | updates | 11 months ago | 
				
					
						|  Sultan khan | 275c2a8aa7 | Merge branch 'payment_worklist_CR_6939' # Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart | 1 year ago | 
				
					
						|  taha.alam | adc26a2435 | Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade # Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart | 1 year ago | 
				
					
						|  Sultan khan | bafb6c8470 | missing swipe issue and payment work-list and business trip issue fixed. | 1 year ago | 
				
					
						|  taha.alam | 2bdaaf9e16 | WD: flutter upgrade fron 3.7 to 3.19.0 | 1 year ago | 
				
					
						|  haroon amjad | 3327130e74 | Attendance location updates | 1 year ago | 
				
					
						|  Sikander Saleem | 2b7df41f35 | advance search bottom sheet issue when keyboard appear. | 2 years ago | 
				
					
						|  haroon amjad | 22af6fa2f9 | Huawei location fix | 2 years ago | 
				
					
						|  haroon amjad | 55c096aa7e | Chat video fixes | 2 years ago | 
				
					
						|  haroon amjad | d3358d578c | Update to stores | 2 years ago | 
				
					
						|  haroon amjad | 697d44635c | Storage permissions handled | 2 years ago | 
				
					
						|  haroon amjad | a411b8e978 | File picker permission issue fixed | 2 years ago | 
				
					
						|  Aamir Muhammad | 6cf7340417 | Business Card Design Update | 2 years ago | 
				
					
						|  Sikander Saleem | 7f6f240590 | CR-6273 improvement. | 2 years ago | 
				
					
						|  Sikander Saleem | 58962ede03 | CR-6273 implemented. | 2 years ago | 
				
					
						|  haroon amjad | 0fd1c8c96b | Merge branch 'master' into development_haroon | 2 years ago | 
				
					
						|  haroon amjad | e39526b5eb | Updates & fixes | 2 years ago | 
				
					
						|  Sikander Saleem | 23b4e81170 | my documents added. | 2 years ago | 
				
					
						|  haroon amjad | 59116b700a | Location check added | 2 years ago | 
				
					
						|  haroon amjad | 1dca3076d9 | Survey dynamic questions | 3 years ago | 
				
					
						|  haroon amjad | 064be6d195 | updates & fixes | 3 years ago | 
				
					
						|  Sikander Saleem | 227855a6a5 | dynamic text field improvement. | 3 years ago | 
				
					
						|  haroon amjad | c34d8a2633 | Location updates | 3 years ago | 
				
					
						|  mirza.shafique | 7d7acfa2df | Merge branch 'master' into development_mirza # Conflicts:
#	lib/main.dart | 3 years ago | 
				
					
						|  haroon amjad | 4bac19f9b8 | Platform ID & Huawei fixes | 3 years ago | 
				
					
						|  haroon amjad | 8f83f89dc7 | Item for sale improvements | 3 years ago | 
				
					
						|  haroon amjad | ca369f2243 | huawei attendance fixes | 3 years ago | 
				
					
						|  haroon amjad | 20109cbe9e | Attendance fixes | 3 years ago | 
				
					
						|  haroon amjad | 182fa6774e | Huawei push implementation | 3 years ago | 
				
					
						|  mirza.shafique | 2455e27595 | hmg wifi implementation | 3 years ago | 
				
					
						|  haroon amjad | 91eb51e42f | marathon updates & DateFormat fixes | 3 years ago | 
				
					
						|  haroon amjad | be32b9c4a2 | attendance fixes | 3 years ago | 
				
					
						|  Sikander Saleem | 550e26dce1 | Attendance loader fix | 3 years ago |