Commit Graph

1211 Commits (49d46dada2f443aff5bb3612b166e16c82eac374)

Author SHA1 Message Date
FaizHashmi de57bfd9eb Fixes 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 c42c30658f no message 3 weeks ago
FaizHashmi f079b84614 km away fixed. 3 weeks ago
FaizHashmi f05aafbd52 km away fixed. 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
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 9638d98b76 no message 3 weeks 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 11155457b8 Update to stores VersionID 10.1 2 months ago
haroon amjad bea191e987 Merge branch 'flutter_upgrade_with_timesheet_changes' 2 months ago
haroon amjad 89b77c205b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 2 months ago
Sultan khan bfd1ce2eab add family member issue fixed. 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
Sultan khan f218dab93e PR changes done. 4 months ago
Sultan khan a5e0e1165e Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Timer Counter & Dead line Counter Null Handling
4 months ago
aamir-csol e9fc205bee Timer Counter & Dead line Counter Null Handling 6 months ago
Sultan khan a37ce5c666 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  update to stores, VersionID 10.0
  ENSAT, Notification Timer Counter & Dead Line

# Conflicts:
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
6 months ago
Sultan khan a6454776dd fixes for monthly calendar color coding .. and ticket screen 6 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
Sultan khan 4a09bbdf1b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app 7 months ago
Sultan khan 2c2d16674e calendar issue fixed and courses enabled. 7 months ago
haroon amjad 9763c7c014 Update to stores, VersionID 9.9 7 months ago
Aamir Saleem Ahmad 598ce5d7fe ticket enable 7 months ago
aamir-csol 8260a65bdd dashboard 7 months ago
aamir-csol de3f091ef1 dashboard 7 months ago
aamir-csol 279fbc85d1 Merge branch 'master' into flutter_upgrade_with_timesheet_changes 7 months ago
aamir-csol ecc0869a23 Ticket 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
aamir-csol e1f2819fe6 Ticket 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 a131179c71 VHR-279 7 months ago
aamir-csol 9f4e9943cf VHR-279 7 months ago
aamir-csol deffeda015 Alma 7 months ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 8 months ago
haroon amjad 3391cf49ef updates 8 months ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 8 months ago
haroon amjad bdaccf133c updates 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
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
haroon amjad eb3eb1d102 updates 8 months ago
aamir-csol 257b803cce QIPS-1205 8 months ago
aamir-csol a958257ce9 Greeting 8 months ago
aamir-csol dae746587f QIPS-1205 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 a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 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
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 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 12d8fd95ba approval level commented Code for filter . 9 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 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 e3fcc992df approval level commented Code for filter . 9 months ago
aamir-csol d021c95def Parking Qr Solution 10 months ago
aamir-csol 74bcf3e1b7 translation 10 months ago
aamir-csol 912f7b23f1 Merge branch 'master' into etqan_ovr_integration 10 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 10 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 10 months ago
aamir-csol 5809aa157f Ticket Attachments 10 months ago
aamir-csol e11b214a28 Merge remote-tracking branch 'origin/flutter_upgrade_with_timesheet_changes' into flutter_upgrade_with_timesheet_changes 10 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 11 months ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 11 months ago
Sultan khan 89ea554c7a Merge branch 'flutter_upgrade_with_timesheet_changes' 11 months ago
Sultan khan 3d91a1444e wallet ticket fix 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 c191d4c0c0 Survey Title Key Fix 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