Commit Graph

1352 Commits (5ff9fc58085229d2f779f927b32bb0d334a6bddf)
 

Author SHA1 Message Date
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 1 month ago
Sikander Saleem 0a9dd86ce0 improvements. 1 month ago
Sikander Saleem af69b2959b Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/api_manager.dart
#	lib/controllers/api_routes/urls.dart
1 month ago
Sikander Saleem 12cd68a30f Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
1 month ago
Sikander Saleem f4d47244be Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
#	lib/controllers/providers/api/user_provider.dart
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
#	lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.dart
1 month ago
Sikander Saleem 05e97a5c47 apk provided for pre-release. 2 months ago
waseemabbasi22 2962f248e0 timer fixes 2 months ago
Sikander Saleem e7e0f7375c chat fix when contact persons list is empty. 2 months ago
Sikander Saleem ff7ee7f8bb user module permission api added. asset inventory switch to user permissions. 2 months ago
waseemabbasi22 de48ca97bd initial test done 2 months ago
waseemabbasi22 c9d2df4ea7 Merge remote-tracking branch 'origin/design_3.0_internal_audit_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 months ago
waseemabbasi22 b4943aff3d initial test done 2 months ago
Sikander Saleem f6f5048cc8 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	pubspec.lock
#	pubspec.yaml
2 months ago
Sikander Saleem 60125bb6d9 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 2 months ago
Sikander Saleem 9eb828cc75 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 months ago
Sikander Saleem 92a94577d5 merge conflict resolved. 2 months ago
Sikander Saleem 6ef6bc40a0 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/dashboard_latest/widgets/request_category_list.dart
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
2 months ago
Sikander Saleem bbeabda38d parameter added for push notifications. 2 months ago
Sikander Saleem 4f78e23922 chat widget finalized. 2 months ago
WaseemAbbasi22 542070c791 improvements 2 months ago
Sikander Saleem e1c06a1857 site id improvement 2 months ago
Sikander Saleem 59d21ae72e jira 1430 & 1434 & 1437 fixed. 2 months ago
Sikander Saleem e3857149e7 improvements 2 months ago
Sikander Saleem 1f074b33e5 chat finalized. 2 months ago
Sikander Saleem c31771aaa7 chat improvements 2 months ago
Sikander Saleem e52caee730 chat improvements 2 months ago
Sikander Saleem f3aa929cb1 view all attachments added. 2 months ago
Sikander Saleem 7445902564 chat attachment added. 2 months ago
Sikander Saleem c5b4325aec survey notification finalized. 2 months ago
Sikander Saleem 186987c5ce chat flow improvement and connect to SignalR. 2 months ago
Sikander Saleem 781e61814a survey questionare finalized. 2 months ago
Sikander Saleem 47e68b8cc3 switch to dev. 2 months ago
Sikander Saleem db1e7ea0bd 1 to 1 chat ui completed for text message, with 2 users. 2 months ago
Sikander Saleem a902204ff1 survey improvements. 2 months ago
WaseemAbbasi22 659f2029dc label changes 2 months ago
WaseemAbbasi22 a04ae0c833 attachment fixes 2 months ago
Sikander Saleem 9d7c3a38b2 chat connection improvements 2 months ago
Sikander Saleem 37ff2b4f4a APK to provided to FM with fixed tracker issues. 2 months ago
Sikander Saleem 1cc5ebd9fb survey question cont. 2 months ago
Sikander Saleem bcfa23bad3 chat message ui completed for sender and recipient. 2 months ago
Sikander Saleem 01f004cecc chat development cont. 2 months ago
Sikander Saleem 830700ce79 grey error fixed on release build. 2 months ago
Sikander Saleem ec28f8992c chat cont. 2 months ago
Sikander Saleem 12e971749e rename Oracle Code-> Name/Oracle Code 2 months ago
Sikander Saleem 233dc19030 users position added. 2 months ago
Sikander Saleem 675c1fa10b for uat 2 months ago
Sikander Saleem 5c8e1d5763 bug fixes. 2 months ago
WaseemAbbasi22 c1455378a6 bug fixes and improvements 2 months ago
Sikander Saleem 3d2e908613 traf form validation added. 2 months ago
WaseemAbbasi22 81dd189025 internal audit api's implementation in progress 2 months ago