wala_plus_with_dialog_removal #22

Merged

khansultan1 merged 130 commits from wala_plus_with_dialog_removal into master_merge

Author	SHA1	Message	Date
Sultan khan	f9332d29ae	no message	22 hours ago
Sultan khan	95888fdb64	no message	22 hours ago
Sultan khan	548aa501a1	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: Security changes Update dependencies and remove unused keys from localization changes for Latest AGP Update dependencies and improve code structure chat history maintained translation added. Chat Bot Completed Chat Bot Completed chat bot & Speech to Text	2 days ago
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
Sultan khan	c32b155718	ui updates	2 days ago
haroon amjad	efee685178	Security changes	2 days ago
Sultan khan	f483c858ef	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: made the city search functional	1 week ago
FaizHashmi	3dcb332a04	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	1 week ago
FaizHashmi	48e5d70ada	made the city search functional	1 week ago
Sultan khan	3cf2c2a4c8	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: made the city search functional	1 week ago
FaizHashmi	06295821aa	made the city search functional	1 week ago
Sultan khan	ae1bd7f0c5	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: Fav Tab Changes and SearchBar Fix icons	1 week ago
FaizHashmi	6ba06065b3	Fav Tab Changes and SearchBar Fix	1 week ago
FaizHashmi	d75f9a9cc3	icons	2 weeks ago
Sultan khan	63f678b666	Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	ef7078c152	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	252b9b471c	Toast fixed	2 weeks ago
Sultan khan	bd6e9577e3	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: Toast fixed # Conflicts: # lib/generated/codegen_loader.g.dart # lib/generated/locale_keys.g.dart	2 weeks ago
Sultan khan	e6cc2491b4	no message	2 weeks ago
Sultan khan	5194f8b1fd	no message	2 weeks ago
FaizHashmi	2fb4a99a42	Toast fixed	2 weeks ago
Sultan khan	fe36263ac0	design changed	2 weeks ago
Sultan khan	99c2d658e1	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: Toast fixed	2 weeks ago
Sultan khan	1d2ed863ae	no message	2 weeks ago
FaizHashmi	b931ed8138	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	b25b398695	Toast fixed	2 weeks ago
Sultan khan	c957d547a8	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: Toast fixed	2 weeks ago
Sultan khan	a517e4e48b	last login token updated.	2 weeks ago
FaizHashmi	a0c5ac7e6c	Toast fixed	2 weeks ago
Sultan khan	7043f0f91c	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: FIXING fixed toast color	2 weeks ago
FaizHashmi	99646c90c5	FIXING	2 weeks ago
Sultan khan	1a4dd29a9b	no message	2 weeks ago
FaizHashmi	9bcb6c6b8a	fixed toast color	2 weeks ago
Sultan khan	e66154d476	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: Fav Fix	2 weeks ago
FaizHashmi	2a4cd36ba9	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	a152fe1da2	Fav Fix	2 weeks ago
Sultan khan	6b364b4109	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: Filters Fix Filters Fix	2 weeks ago
FaizHashmi	367218702b	Filters Fix	2 weeks ago
FaizHashmi	c976b9c9db	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	ca9c7f7e5d	Filters Fix	2 weeks ago
Sultan khan	d23910351f	bottomsheet added	2 weeks ago
Sultan khan	49d46dada2	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: chip color change	2 weeks ago
FaizHashmi	fc04ff13bc	chip color change	2 weeks ago
Sultan khan	a0967051e8	Arabic text updated.	2 weeks ago
Sultan khan	bdf3337af4	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: chip color change	2 weeks ago
FaizHashmi	9aa368dbf7	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	2 weeks ago
FaizHashmi	d6fdcb214d	chip color change	2 weeks ago
Sultan khan	a8f9d275f5	no message	2 weeks ago
Sultan khan	ecf1c7c948	no message	2 weeks ago
Sultan khan	5a96d64d9c	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: chip set # Conflicts: # lib/ui/landing/dashboard_screen_for_dependet.dart	2 weeks ago
Sultan khan	bd6e6c6f59	no message	2 weeks ago
Sultan khan	7c9599ff6e	no message	2 weeks ago
FaizHashmi	62058d6dd9	chip set	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
Sultan khan	3a73ec1c2e	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 shimmer # Conflicts: # lib/generated/locale_keys.g.dart	2 weeks ago
FaizHashmi	59bba20e20	added shimmer	2 weeks ago
Sultan khan	4b1589f7df	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 sub categories # Conflicts: # lib/generated/locale_keys.g.dart	2 weeks ago
Sultan khan	975f6622b4	no message	2 weeks ago
FaizHashmi	154b62bbad	Added sub categories	2 weeks ago
Sultan khan	821cdf474d	ui updates	2 weeks ago
Sultan khan	f6865959e6	no message	2 weeks ago
Sultan khan	e21738cf5f	no message	2 weeks ago
Sultan khan	518c766756	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: fixed suggestions	3 weeks ago
FaizHashmi	ec37e74bc0	fixed suggestions	3 weeks ago
Sultan khan	58908df424	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: minor changes refactoriåtion	3 weeks ago
Sultan khan	7065a4fb23	no message	3 weeks ago
FaizHashmi	cc03ab6a80	minor changes	3 weeks ago
FaizHashmi	287afc6ff1	Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal	3 weeks ago
FaizHashmi	6aec5b1a8c	refactoriåtion	3 weeks ago
Sultan khan	4cd4766ab8	no message	3 weeks ago
Sultan khan	798584431e	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: refactoriåtion	3 weeks ago
FaizHashmi	e134e8d4e5	refactoriåtion	3 weeks ago
Sultan khan	825845b4c3	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: changhes toast gravity change # Conflicts: # lib/ui/landing/dashboard_screen_for_dependet.dart	3 weeks ago
Sultan khan	0a270bd323	login flow updated	3 weeks ago
FaizHashmi	fa1cbf866b	changhes	3 weeks ago
FaizHashmi	ae816a1f8f	toast gravity change	3 weeks ago
FaizHashmi	371a3ecb74	toast gravity change	3 weeks ago
FaizHashmi	f19a1441b3	url change	3 weeks ago
FaizHashmi	857d1e74ac	Merge branch 'wala_plus' into wala_plus_with_dialog_removal	3 weeks ago
FaizHashmi	e05e97a536	Updated the dialogs to toast	3 weeks ago
Sultan khan	1f8564b10a	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: CHANGED THE BASE URL	3 weeks ago
Sultan khan	d6310e5233	search	3 weeks ago
FaizHashmi	623957be1a	CHANGED THE BASE URL	3 weeks ago
Sultan khan	a4fb5af6e9	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: fixed the dependent flow.	3 weeks ago
FaizHashmi	aff3bc2fc0	fixed the dependent flow.	3 weeks ago
Sultan khan	2cc22bdc21	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: dependent_details_screen.dart fix	3 weeks ago
FaizHashmi	269a1a4da8	dependent_details_screen.dart fix	3 weeks ago
Sultan khan	87bcdf72cb	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: UI Fixes	3 weeks ago
Sultan khan	deae01a677	no message	3 weeks ago
FaizHashmi	771b16c519	UI Fixes	3 weeks ago
Sultan khan	21ebc3fae1	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: Fixes	3 weeks ago
FaizHashmi	52821bf662	Merge remote-tracking branch 'origin/wala_plus' into wala_plus	3 weeks ago
FaizHashmi	2bcad27712	Fixes	3 weeks ago
Sultan khan	55727fe98b	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: Fixes	3 weeks ago
Sultan khan	84ff0798fa	no message	3 weeks ago
FaizHashmi	de57bfd9eb	Fixes	3 weeks ago
Sultan khan	6295fcc55c	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: km away fixed.	3 weeks ago
FaizHashmi	a165bf695d	Merge remote-tracking branch 'origin/wala_plus' into wala_plus	3 weeks ago
FaizHashmi	a94613f693	km away fixed.	3 weeks ago
Sultan khan	42b2844dbd	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: km away fixed.	3 weeks ago
Sultan khan	92db054635	no message	3 weeks ago
Sultan khan	c42c30658f	no message	3 weeks ago
FaizHashmi	51ac2d8051	Merge remote-tracking branch 'origin/wala_plus' into wala_plus	3 weeks ago
FaizHashmi	f079b84614	km away fixed.	3 weeks ago
Sultan khan	d411df32c6	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: km away fixed.	3 weeks ago
FaizHashmi	f05aafbd52	km away fixed.	3 weeks ago
Sultan khan	c3afbdc55b	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: filter api added tested in release mode the QR Fix Added business card API	3 weeks ago
FaizHashmi	74bb37593a	filter api added	3 weeks ago
FaizHashmi	703f10349e	tested in release mode the QR Fix	3 weeks ago
FaizHashmi	3e4f97a4c1	Added business card API	3 weeks ago
Sultan khan	d48ddd3e4e	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: pushed text changes	3 weeks ago
FaizHashmi	51dd63badf	pushed	3 weeks ago
FaizHashmi	7cd0b94f15	Merge remote-tracking branch 'origin/wala_plus' into wala_plus	3 weeks ago
FaizHashmi	ae2970eed1	text changes	3 weeks ago
Sultan khan	5b29b5d42e	no message	3 weeks ago
Sultan khan	94ad9bff62	Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus * 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: changes	3 weeks ago
Sultan khan	330b317164	no message	3 weeks ago
FaizHashmi	858fa7edb7	changes	3 weeks ago
Sultan khan	4541bfb1db	no message	3 weeks ago
Sultan khan	9638d98b76	no message	3 weeks ago
haroon amjad	6344d78302	Merge branch 'master_merge'	4 weeks ago
Haroon6138	cd9f8e0b48	Merge pull request 'flutter_upgrade_with_timesheet_changes' (#21 ) from flutter_upgrade_with_timesheet_changes into master Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/21	4 weeks ago
Haroon6138	c49872f798	Merge branch 'master' into flutter_upgrade_with_timesheet_changes	4 weeks ago
Sultan khan	ca6ce85d7d	retailer screen added.	1 month ago
Sultan khan	782ad51823	categories updated.	1 month ago
Sultan khan	3cfe5355ef	Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into flutter_upgrade_with_timesheet_changes * 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app: Update to stores VersionID 10.1 updates	1 month ago
Aamir Muhammad	9d7372ea4a	Wala-Plus Independent Pre Login & Saved Login	2 months ago
Aamir Muhammad	c0497201b6	Wala-Plus Independent Login	2 months ago

Labels Milestones

wala_plus_with_dialog_removal #22

130 Commits (master)