289 Commits (master_merge)

Author	SHA1	Message	Date
haroon amjad	38906e24b7	Merge branch 'master' into wala_plus_with_dialog_removal ... # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # ios/Flutter/AppFrameworkInfo.plist # ios/Runner.xcodeproj/project.pbxproj # ios/Runner/Info.plist # lib/classes/consts.dart # lib/config/routes.dart # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart # lib/models/generic_response_model.dart # lib/models/get_mobile_login_info_list_model.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/login/verify_last_login_screen.dart # pubspec.yaml	2 days ago
FaizHashmi	48e5d70ada	made the city search functional	1 week ago
FaizHashmi	2fb4a99a42	Toast fixed	2 weeks ago
Sultan khan	fe36263ac0	design changed	2 weeks ago
Sultan khan	37303458bf	Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal ... * 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: Added filters # Conflicts: # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/generated/locale_keys.g.dart # lib/ui/landing/dashboard_screen_for_dependet.dart	2 weeks ago
Sultan khan	cd2703cbc5	favorite offers done	2 weeks ago
FaizHashmi	6d4bddd42d	Added filters	2 weeks ago
FaizHashmi	154b62bbad	Added sub categories	2 weeks ago
Sultan khan	f6865959e6	no message	2 weeks ago
Sultan khan	e21738cf5f	no message	2 weeks ago
FaizHashmi	cc03ab6a80	minor changes	3 weeks ago
FaizHashmi	6aec5b1a8c	refactoriåtion	3 weeks ago
Sultan khan	0a270bd323	login flow updated	3 weeks ago
FaizHashmi	aff3bc2fc0	fixed the dependent flow.	3 weeks ago
FaizHashmi	de57bfd9eb	Fixes	3 weeks ago
Sultan khan	c42c30658f	no message	3 weeks ago
FaizHashmi	f05aafbd52	km away fixed.	3 weeks ago
FaizHashmi	74bb37593a	filter api added	3 weeks ago
FaizHashmi	3e4f97a4c1	Added business card API	3 weeks ago
Sultan khan	330b317164	no message	3 weeks ago
Sultan khan	9638d98b76	no message	3 weeks ago
Haroon Amjad	4baf5f9389	Update dependencies and remove unused keys from localization	4 weeks ago
Haroon Amjad	f503dca074	Merge branch 'apilevel_raise' into master_merge ... # Conflicts: # android/app/build.gradle # android/gradle/wrapper/gradle-wrapper.properties # android/settings.gradle # assets/langs/ar-SA.json # assets/langs/en-US.json # lib/api/dashboard_api_client.dart # lib/classes/consts.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/dashboard_screen.dart # lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart # pubspec.yaml	4 weeks ago
Sultan khan	0175c958ef	translation added.	1 month ago
Sultan khan	ca6ce85d7d	retailer screen added.	1 month ago
Sultan khan	782ad51823	categories updated.	1 month ago
Aamir Muhammad	c0497201b6	Wala-Plus Independent Login	2 months ago
Sultan khan	a9f0cb8216	CEI, worklist po pr filter, date issue in absence dynamic screen	2 months ago
Sultan khan	f218dab93e	PR changes done.	4 months ago
aamir-csol	1d3f33ea81	ENSAT, Notification Timer Counter & Dead Line	7 months ago
aamir-csol	90faa4dd5e	Merge branch 'Courses-CR#-7150' into flutter_upgrade_with_timesheet_changes ... # Conflicts: # lib/api/api_client.dart # lib/api/dashboard_api_client.dart # lib/classes/consts.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/landing/widget/app_drawer.dart # lib/ui/screens/ticket/ticket_detailed_screen.dart # lib/widgets/sso_webview_widget.dart	7 months ago
Sultan khan	8ea831c2c4	color coding changes on the monthly leave calendar and prod e-learning URL added.	7 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
Sultan khan	3343e4fe10	sso and courses in app browser updated	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	257b803cce	QIPS-1205	8 months ago
aamir-csol	ba8908d4eb	Greeting Card	8 months ago
aamir-csol	2c7d3bf963	QIPS-1175,QIPS-1179,QIPS-1180	8 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	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
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
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 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