|  aamir-csol | 0b08606813 | Ticket History | 2 weeks ago | 
				
					
						|  aamir-csol | 107846dd82 | Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes # Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart | 2 weeks ago | 
				
					
						|  aamir-csol | c7e44965d6 | Get Ticket Accural Balance Changes | 2 weeks ago | 
				
					
						|  aamir-csol | cca95cee6a | ticket changes moved to dashboard & wallet balance | 1 month ago | 
				
					
						|  aamir-csol | 1bcecde59b | ticket changes moved to dashboard | 2 months ago | 
				
					
						|  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 | 
				
					
						|  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 | 
				
					
						|  Aamir Muhammad | 72c178382f | time sheet changes | 6 months ago | 
				
					
						|  sultan khan | c26b2d9a5f | search employee inprogress | 8 months ago | 
				
					
						|  Sikander Saleem | 6e3fc55fde | event activity added - cont | 9 months ago | 
				
					
						|  Sikander Saleem | c35074576a | offer and discount, do not show if api have issue. | 9 months 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 | 
				
					
						|  Sikander Saleem | 58962ede03 | CR-6273 implemented. | 2 years ago | 
				
					
						|  haroon amjad | 281f0bab78 | updates | 2 years ago | 
				
					
						|  haroon amjad | a58d4753e4 | Merge branch 'sultan-dev' into development_haroon # Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml | 2 years ago | 
				
					
						|  Sikander Saleem | 23b4e81170 | my documents added. | 2 years ago | 
				
					
						|  Sultan khan | 608a8fcb97 | Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart | 2 years ago | 
				
					
						|  Sultan khan | 790103bdc9 | chat changes | 2 years ago | 
				
					
						|  Sultan khan | fd6058e87d | Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev # Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart | 3 years ago | 
				
					
						|  Sikander Saleem | 571b8bd7af | itg active directory password change added. | 3 years ago | 
				
					
						|  Sultan khan | 9cb71b525e | group chat started | 3 years ago | 
				
					
						|  mirza.shafique | 7d7acfa2df | Merge branch 'master' into development_mirza # Conflicts:
#	lib/main.dart | 3 years ago | 
				
					
						|  haroon amjad | 99c1f95e1f | Attendance Progress screen fixes | 3 years ago | 
				
					
						|  haroon amjad | e0d02554b1 | Merge branch 'master' into development_haroon | 3 years ago | 
				
					
						|  haroon amjad | 182fa6774e | Huawei push implementation | 3 years ago | 
				
					
						|  Aamir Muhammad | 2303daa1ad | Merge branch 'master' into development_aamir | 3 years ago | 
				
					
						|  Aamir Muhammad | a8008bb9a7 | Chat Fix & Web RTC Methods | 3 years ago | 
				
					
						|  mirza.shafique | 2455e27595 | hmg wifi implementation | 3 years ago | 
				
					
						|  haroon amjad | 91eb51e42f | marathon updates & DateFormat fixes | 3 years ago | 
				
					
						|  Aamir Muhammad | a78b5b0a19 | Merge branch 'master' into development_aamir # Conflicts:
#	lib/classes/notifications.dart | 3 years ago | 
				
					
						|  Aamir Muhammad | c55c3d6a91 | Notification | 3 years ago | 
				
					
						|  Aamir Muhammad | 4a431fb752 | Notification Fix | 3 years ago | 
				
					
						|  Sikander Saleem | 0e329e8e2b | ticket balance value display fixed & infant added in value. | 3 years ago | 
				
					
						|  Aamir Muhammad | 948689b67a | Notification To Specific Screen | 3 years ago | 
				
					
						|  Aamir Muhammad | ffd894ca28 | Notification To Specific Screen | 3 years ago | 
				
					
						|  Sikander Saleem | f8ae5b0987 | mark attendance session expire fixed | 3 years ago | 
				
					
						|  Aamir Muhammad | c8f9826266 | Permission Issue | 3 years ago | 
				
					
						|  Aamir Muhammad | b152f8a6d6 | Permission Issue | 3 years ago | 
				
					
						|  Aamir Muhammad | 1f69ee262d | Permission Issue | 3 years ago | 
				
					
						|  haroon amjad | f933539395 | dialog added to app settings | 3 years ago | 
				
					
						|  haroon amjad | c763e16f41 | Merge branch 'master' into development_haroon | 3 years ago | 
				
					
						|  Aamir Muhammad | dbb13515fc | Audio Fix | 3 years ago | 
				
					
						|  Sikander Saleem | 377fd48693 | Ios Fix | 3 years ago | 
				
					
						|  Aamir Muhammad | 83b8691a31 | Ios Stream Audio | 3 years ago |