|  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 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 | 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 | d4b7550bab | Worklist actions buttons updates | 6 months ago | 
				
					
						|  Sikander Saleem | 9b683235c9 | request information added, | 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 | 9362859013 | CEI notification body added. | 10 months ago | 
				
					
						|  Sikander Saleem | 3e19508c5e | child education assistance added. | 10 months ago | 
				
					
						|  Sikander Saleem | d4e17e7f0d | dynamic form parent value added. (saudi council employee) | 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 | 423e8551f1 | changes updated | 1 year ago | 
				
					
						|  Sikander Saleem | 550992ccf4 | generate QR Api email parameter added. | 1 year ago | 
				
					
						|  Sikander Saleem | 030887452d | generate QR Api added. | 1 year ago | 
				
					
						|  haroon amjad | f09f08be82 | Store update to version 6.0 | 1 year ago | 
				
					
						|  Sultan khan | c7a4e4023e | error code 699 fixes | 1 year ago | 
				
					
						|  haroon amjad | 55c096aa7e | Chat video fixes | 2 years ago | 
				
					
						|  haroon amjad | d3358d578c | Update to stores | 2 years ago | 
				
					
						|  Sikander Saleem | df07a5f9f6 | Merge branch 'master' into development_sikander | 2 years ago | 
				
					
						|  haroon amjad | c7ff754dd8 | Password expired fixes & ITG Attachments implementation | 2 years ago | 
				
					
						|  Sikander Saleem | 2cea45f0e1 | Merge branch 'master' into development_sikander # Conflicts:
#	lib/app_state/app_state.dart | 2 years ago | 
				
					
						|  haroon amjad | fc3c1c057a | Attachments handled in transactions list mowadhafi | 2 years ago | 
				
					
						|  Haroon6138 | 7faf1ca530 | Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15 | 2 years ago | 
				
					
						|  haroon amjad | a411b8e978 | File picker permission issue fixed | 2 years ago | 
				
					
						|  Sultan khan | c86d9f4678 | termination work-list fixed | 2 years ago | 
				
					
						|  Sikander Saleem | d44bc37681 | marathon tutorial added. | 2 years ago | 
				
					
						|  Faiz Hashmi | 684a200285 | Join MarathonProviderFix | 2 years ago | 
				
					
						|  haroon amjad | ff908bd2a7 | updates | 2 years ago | 
				
					
						|  Sultan khan | 88be17249d | Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev # Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart | 2 years ago | 
				
					
						|  Sultan khan | c9886be2d8 | work list ITG str change | 2 years ago | 
				
					
						|  Sultan khan | d7f45fa0b9 | ITG change pushed. | 2 years ago | 
				
					
						|  devamirsaleemahmad | 12ec0a25ee | business trip settlement fix. | 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 | 
				
					
						|  haroon amjad | a48d703642 | ITG ADs update | 2 years ago | 
				
					
						|  Sikander Saleem | 23b4e81170 | my documents added. | 2 years ago | 
				
					
						|  haroon amjad | 1a8db3b0ee | ERM Channel updates | 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 | 
				
					
						|  haroon amjad | 9030b9bc81 | Notification details implemented | 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 | 879e2aa561 | Merge branch 'master' into development_sikander | 3 years ago |