461 Commits (cd399a032c77191f2ed30278e5ced21d23fca41f)

Author	SHA1	Message	Date
haroon amjad	e4d182912c	Merge branch 'master_mohemm_flutter' ... # Conflicts: # assets/langs/en-US.json # ios/Runner/Info.plist # lib/app_state/app_state.dart # pubspec.yaml	8 months ago
Sultan khan	5da81968d7	Merge branch 'greeting_card' into Courses-CR#-7150 ... * greeting_card: Greeting Greeting Card # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/api/dashboard_api_client.dart # lib/generated/codegen_loader.g.dart # lib/provider/dashboard_provider_model.dart	8 months ago
Sultan khan	b240f55aff	Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into Courses-CR#-7150 ... # Conflicts: # lib/ui/landing/widget/menus_widget.dart	8 months ago
haroon amjad	2c9db30d6a	Merge branch 'master' into etqan_ovr_integration ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/api/dashboard_api_client.dart # lib/config/routes.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/provider/dashboard_provider_model.dart	8 months ago
aamir-csol	facb3bf4e6	QIPS-1205	8 months ago
aamir-csol	71d03ba664	QIPS-1205	8 months ago
aamir-csol	9f663df3cc	QIPS-1205	8 months ago
aamir-csol	ba8908d4eb	Greeting Card	8 months ago
aamir-csol	31d1804f7a	QIPS-1175,QIPS-1179,QIPS-1180	9 months ago
haroon amjad	82c9aa8a2f	updates	9 months ago
aamir-csol	048c9b395f	approval level commented Code for filter .	9 months ago
aamir-csol	eea35e4d77	approval level commented Code for filter .	9 months ago
Sultan khan	fe583c234b	Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app ... * 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: approval level commented Code for filter . Parking Qr Solution CR-19329 - ERP MOWADHFAI System changes Changed the device identifier, Update to Stores VersionID 9.5 Update to Stores for Fixed Asset Disposal, VersionID 9.4 # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/api/dashboard_api_client.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart	9 months ago
Sultan khan	a426bc332e	E-learning Mandatory Courses - CR# 7150	9 months ago
aamir-csol	dfa7d9a713	approval level commented Code for filter .	9 months ago
aamir-csol	d021c95def	Parking Qr Solution	10 months ago
aamir-csol	99414bf787	Itiqan Ovr Completed	10 months ago
aamir-csol	5809aa157f	Ticket Attachments	10 months ago
aamir-csol	234dce65e5	chat bot & Speech to Text	10 months ago
haroon amjad	89fa395183	Merge branch 'master_mohemm_flutter' ... # Conflicts: # android/app/src/main/AndroidManifest.xml # lib/app_state/app_state.dart # lib/main.dart # pubspec.yaml	11 months ago
haroon amjad	1ee51a7597	Changed the device identifier, Update to Stores VersionID 9.5	11 months ago
haroon amjad	4d0918cd25	Merge branch 'master_mohemm_flutter' ... # Conflicts: # android/app/build.gradle # ios/Runner.xcodeproj/project.pbxproj # lib/app_state/app_state.dart # lib/ui/landing/widget/app_drawer.dart # pubspec.yaml	11 months ago
Sultan khan	bc697df13d	Merge branch 'flutter_upgrade_with_timesheet_changes'	12 months ago
Sultan khan	fb35e256e7	CS Standard Change Request ... CR-7260 Fixed Asset Disposal Request amendment	12 months ago
Sultan khan	c9d5ab98a3	work-list fixes	1 year ago
aamir-csol	b96c460d6b	Get Notification User Information Updates	1 year ago
aamir-csol	676e662967	Survey title key fix	1 year ago
Sultan khan	bf3f9b55fc	changes for security ogout attempt..	1 year ago
aamir-csol	0b08606813	Ticket History	1 year 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	1 year ago
aamir-csol	c7e44965d6	Get Ticket Accural Balance Changes	1 year ago
aamir-csol	cca95cee6a	ticket changes moved to dashboard & wallet balance	1 year ago
haroon amjad	f6df04c432	Merge branch 'master_mohemm_flutter' into mohemm_HMG_flutter_upgrade ... # Conflicts: # lib/app_state/app_state.dart # lib/classes/consts.dart # lib/ui/landing/dashboard_screen.dart # pubspec.yaml	1 year 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	1 year ago
Aamir Muhammad	f61817937b	tickt booking implementation	1 year ago
Syed Taha Alam	e50d1f70b2	upgraded the sdk to 35	1 year ago
Aamir Muhammad	cd36d61640	logins apis	1 year 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	1 year ago
Sultan khan	3b3046804e	upgraded	1 year ago
haroon amjad	8c4bdc5f54	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart # pubspec.yaml	1 year ago
haroon amjad	d4b7550bab	Worklist actions buttons updates	1 year ago
haroon amjad	7c9fc2f29c	Merge branch 'master_mohemm_flutter' ... # Conflicts: # ios/Runner/Info.plist # lib/app_state/app_state.dart # pubspec.yaml	2 years ago
Sikander Saleem	9b683235c9	request information added,	2 years ago
Aamir Muhammad	72c178382f	time sheet changes	2 years ago
sultan khan	c26b2d9a5f	search employee inprogress	2 years ago
haroon amjad	db6b0ad1b0	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart # lib/ui/landing/dashboard_screen.dart # pubspec.yaml	2 years ago
Sikander Saleem	6e3fc55fde	event activity added - cont	2 years ago
Sikander Saleem	9362859013	CEI notification body added.	2 years ago
haroon amjad	4e9725477a	Merge branch 'master_mohemm_flutter' ... # Conflicts: # pubspec.yaml	2 years ago
Sikander Saleem	3e19508c5e	child education assistance added.	2 years ago
haroon amjad	2477d9009a	Merge branch 'master_mohemm_flutter' ... # 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 # pubspec.yaml	2 years ago
Sikander Saleem	d4e17e7f0d	dynamic form parent value added. (saudi council employee)	2 years ago
haroon amjad	26bbc54503	Merge branch 'master_mohemm_flutter' ... # Conflicts: # AppIcons/Assets.xcassets/AppIcon.appiconset/100.png # AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png # AppIcons/Assets.xcassets/AppIcon.appiconset/114.png # AppIcons/Assets.xcassets/AppIcon.appiconset/120.png # AppIcons/Assets.xcassets/AppIcon.appiconset/144.png # AppIcons/Assets.xcassets/AppIcon.appiconset/152.png # AppIcons/Assets.xcassets/AppIcon.appiconset/167.png # AppIcons/Assets.xcassets/AppIcon.appiconset/180.png # AppIcons/Assets.xcassets/AppIcon.appiconset/20.png # AppIcons/Assets.xcassets/AppIcon.appiconset/29.png # AppIcons/Assets.xcassets/AppIcon.appiconset/40.png # AppIcons/Assets.xcassets/AppIcon.appiconset/50.png # AppIcons/Assets.xcassets/AppIcon.appiconset/57.png # AppIcons/Assets.xcassets/AppIcon.appiconset/58.png # AppIcons/Assets.xcassets/AppIcon.appiconset/60.png # AppIcons/Assets.xcassets/AppIcon.appiconset/72.png # AppIcons/Assets.xcassets/AppIcon.appiconset/76.png # AppIcons/Assets.xcassets/AppIcon.appiconset/80.png # AppIcons/Assets.xcassets/AppIcon.appiconset/87.png # AppIcons/appstore.png # AppIcons/playstore.png # android/app/src/main/AndroidManifest.xml # android/app/src/main/res/mipmap-hdpi/ic_launcher.png # android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png # android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-mdpi/ic_launcher.png # android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png # android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png # android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png # android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png # android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png # ios/Runner.xcodeproj/project.pbxproj # lib/app_state/app_state.dart # pubspec.yaml	2 years 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	2 years 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	2 years ago
Sultan khan	423e8551f1	changes updated	2 years ago
haroon amjad	f841ccac3e	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart	2 years ago
Sikander Saleem	550992ccf4	generate QR Api email parameter added.	2 years ago
Sikander Saleem	030887452d	generate QR Api added.	2 years ago
haroon amjad	162e1102b5	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart # pubspec.yaml	2 years ago
haroon amjad	f09f08be82	Store update to version 6.0	2 years ago
Sultan khan	c7a4e4023e	error code 699 fixes	2 years ago
haroon amjad	557c356233	Merge branch 'master_mohemm_flutter' ... # Conflicts: # ios/Runner.xcodeproj/project.pbxproj	3 years ago
haroon amjad	55c096aa7e	Chat video fixes	3 years ago
haroon amjad	609d3ca48a	Merge branch 'master_mohemm_flutter' ... # Conflicts: # android/app/src/main/AndroidManifest.xml # ios/Runner.xcodeproj/project.pbxproj # lib/app_state/app_state.dart # pubspec.yaml	3 years ago
haroon amjad	d3358d578c	Update to stores	3 years ago
Sikander Saleem	df07a5f9f6	Merge branch 'master' into development_sikander	3 years ago
haroon amjad	c7ff754dd8	Password expired fixes & ITG Attachments implementation	3 years ago
Sikander Saleem	2cea45f0e1	Merge branch 'master' into development_sikander ... # Conflicts: # lib/app_state/app_state.dart	3 years ago
haroon amjad	fc3c1c057a	Attachments handled in transactions list mowadhafi	3 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	3 years ago
haroon amjad	a411b8e978	File picker permission issue fixed	3 years ago
Sultan khan	c86d9f4678	termination work-list fixed	3 years ago
Sikander Saleem	d44bc37681	marathon tutorial added.	3 years ago
haroon amjad	a4761ffec7	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/api/marathon/marathon_api_client.dart	3 years ago
Faiz Hashmi	684a200285	Join MarathonProviderFix	3 years ago
haroon amjad	2744eff281	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart # lib/ui/app_update_screen.dart # lib/ui/chat/group_chat_detaied_screen.dart # pubspec.yaml	3 years ago
haroon amjad	ff908bd2a7	updates	3 years ago
haroon amjad	39d9136299	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/ui/dialogs/id/business_card_dialog.dart	3 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	3 years ago
Sultan khan	c9886be2d8	work list ITG str change	3 years ago
Sultan khan	d7f45fa0b9	ITG change pushed.	3 years ago
devamirsaleemahmad	12ec0a25ee	business trip settlement fix.	3 years ago
haroon amjad	e433c011e4	Merge branch 'master_mohemm_flutter' ... # Conflicts: # lib/app_state/app_state.dart # lib/classes/notifications.dart # lib/generated_plugin_registrant.dart # pubspec.yaml	3 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	3 years ago
haroon amjad	a48d703642	ITG ADs update	3 years ago
Sikander Saleem	23b4e81170	my documents added.	3 years ago
haroon amjad	c3376c0e3b	Merge branch 'master_mohemm_flutter' into development_haroon ... # Conflicts: # ios/Runner/Info.plist # lib/app_state/app_state.dart	3 years ago
haroon amjad	1a8db3b0ee	ERM Channel updates	3 years ago
haroon amjad	165485965a	Merge branch 'master_mohemm_flutter' into development_haroon ... # Conflicts: # ios/Runner.xcodeproj/project.pbxproj	3 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	3 years ago
Sultan khan	790103bdc9	chat changes	3 years ago
haroon amjad	9030b9bc81	Notification details implemented	3 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	4 years ago
haroon amjad	11d7e8bb8a	Merge branch 'master_mohemm_flutter' into development_haroon	4 years ago
Sikander Saleem	879e2aa561	Merge branch 'master' into development_sikander	4 years ago
Sikander Saleem	571b8bd7af	itg active directory password change added.	4 years ago
haroon amjad	7c53a39167	Merge branch 'master_mohemm_flutter' into development_haroon	4 years ago
haroon amjad	b1e140fb75	PR Details implemented	4 years ago
Sultan khan	9cb71b525e	group chat started	4 years ago