Commit Graph

340 Commits (d7b88e2e7317b98b528b53331ec0483c76c83198)

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
Sultan khan c32b155718 ui updates 2 days ago
FaizHashmi 06295821aa made the city search functional 1 week ago
FaizHashmi b25b398695 Toast fixed 2 weeks ago
FaizHashmi a0c5ac7e6c Toast fixed 2 weeks ago
FaizHashmi 9bcb6c6b8a fixed toast color 2 weeks ago
FaizHashmi ca9c7f7e5d Filters Fix 2 weeks ago
FaizHashmi d6fdcb214d chip color change 2 weeks ago
FaizHashmi 62058d6dd9 chip set 2 weeks ago
Sultan khan cd2703cbc5 favorite offers done 2 weeks ago
FaizHashmi 154b62bbad Added sub categories 2 weeks ago
Sultan khan 821cdf474d ui updates 2 weeks ago
Sultan khan e21738cf5f no message 2 weeks ago
FaizHashmi ae816a1f8f toast gravity change 3 weeks ago
FaizHashmi f19a1441b3 url change 3 weeks ago
FaizHashmi e05e97a536 Updated the dialogs to toast 3 weeks ago
FaizHashmi 623957be1a CHANGED THE BASE URL 3 weeks ago
FaizHashmi 771b16c519 UI Fixes 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 c42c30658f no message 3 weeks ago
FaizHashmi f079b84614 km away fixed. 3 weeks ago
FaizHashmi 3e4f97a4c1 Added business card API 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 9638d98b76 no message 3 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
haroon amjad 9dcbb0d855 changes for Latest AGP 4 weeks ago
taha a6be594b3b Update dependencies and improve code structure 1 month ago
Sultan khan ca6ce85d7d retailer screen added. 1 month ago
Sultan khan 782ad51823 categories updated. 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
haroon amjad 89b77c205b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 2 months ago
haroon amjad 64e2b2c42a updates 2 months ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 2 months ago
haroon amjad 72656a3564 update to stores, VersionID 10.0 7 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
aamir-csol deffeda015 Alma 7 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
haroon amjad eb3eb1d102 updates 8 months ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 8 months ago
haroon amjad 82c9aa8a2f updates 9 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 9 months ago
haroon amjad 9112b26987 updates 9 months ago
aamir-csol d021c95def Parking Qr Solution 10 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 10 months ago
aamir-csol 234dce65e5 chat bot & Speech to Text 10 months ago