Commit Graph

197 Commits (bd6e9577e35ac6c07b947b0b9bb5c791b0df3dd2)

Author SHA1 Message Date
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
FaizHashmi a152fe1da2 Fav Fix 2 weeks ago
Sultan khan d23910351f bottomsheet added 2 weeks ago
Sultan khan a8f9d275f5 no message 2 weeks ago
Sultan khan bd6e6c6f59 no message 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 e21738cf5f no message 2 weeks ago
FaizHashmi cc03ab6a80 minor changes 3 weeks ago
FaizHashmi e134e8d4e5 refactoriåtion 3 weeks ago
FaizHashmi ae816a1f8f toast gravity change 3 weeks ago
FaizHashmi e05e97a536 Updated the dialogs to toast 3 weeks ago
Sultan khan deae01a677 no message 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
FaizHashmi f079b84614 km away fixed. 3 weeks ago
FaizHashmi f05aafbd52 km away fixed. 3 weeks ago
FaizHashmi 858fa7edb7 changes 3 weeks ago
Sultan khan 9638d98b76 no message 3 weeks 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
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 a958257ce9 Greeting 8 months ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 8 months ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 9 months ago
Sultan khan 19ccee6a20 updates 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 a28eb4426b Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration 9 months ago
aamir-csol dfa7d9a713 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 74bcf3e1b7 translation 10 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 10 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 Muhammad 0e54c7dac9 worklist actions fragment action button changes 1 year ago
Aamir Muhammad c62f3f6485 Merge branch 'master' into mohem_flutter_upgrade
# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
1 year ago