Commit Graph

818 Commits (6d20e6f30775873ab84be6feb9b112cb80a6b753)

Author SHA1 Message Date
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 4 weeks ago
Sikander Saleem bf2b777f8d chat improvements. 1 month ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 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
waseemabbasi22 2962f248e0 timer fixes 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 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 4f78e23922 chat widget finalized. 2 months ago
WaseemAbbasi22 542070c791 improvements 2 months ago
Sikander Saleem e3857149e7 improvements 2 months ago
Sikander Saleem 7445902564 chat attachment added. 2 months ago
Sikander Saleem c5b4325aec survey notification finalized. 2 months ago
Sikander Saleem 22a667a7b3 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/dashboard_latest/widgets/request_category_list.dart
#	lib/models/new_models/dashboard_detail.dart
#	lib/new_views/pages/land_page/my_request/my_requests_page.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 160dc57b86 Merge branch 'refs/heads/design_3.0_data_segregation' into design_3.0_asset_inventory_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/controllers/providers/api/all_requests_provider.dart
2 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 2 months ago
Sikander Saleem 25475de68e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_TM_Module_snagsFix
# Conflicts:
#	lib/modules/pm_module/ppm_wo/ppm_details_page.dart
2 months ago
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 3 months ago
Sikander Saleem ae0e08183f asset group switching added. 3 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 3 months ago
Sikander Saleem d3c000004e code improvements 3 months ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 3 months ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 3 months ago
Sikander Saleem dfef9aadb7 Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module 3 months ago
Sikander Saleem a9973047d6 improvement 3 months ago
WaseemAbbasi22 e5775019a4 asset inventory design 3 months ago
Sikander Saleem 4d035e9c46 android AGP upgraded & enhancement. 4 months ago
Sikander Saleem 3ac3c11b4b improvement 4 months ago
WaseemAbbasi22 423968d7f6 timer history added 4 months ago
Sikander Saleem f9c7d335e2 file format. 4 months ago
WaseemAbbasi22 e40d9a1138 ATOMS-1025, ATOMS-937 and some color fixes for dark mode 4 months ago
Sikander Saleem 5e9e8dc870 assistant employee selection sheet ui improvement. 4 months ago
Sikander Saleem 7efeeed619 bottom sheet ui improvements,safe area added. 4 months ago
Sikander Saleem df66cf5c77 improvements 4 months ago
Sikander Saleem b7aefbe7f3 task contact info in detail view, & improvements 4 months ago
WaseemAbbasi22 9a332e86e2 Merge branch 'design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
4 months ago
Sikander Saleem c1a7562e3b create asset transfer, on internal & external destination values reset. 5 months ago
Sikander Saleem 630c1533e7 Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/views/pages/user/requests/create_service_request_page.dart
#	lib/views/widgets/images/multi_image_picker.dart
5 months ago
Sikander Saleem 642d1a908c auto login improvement. 5 months ago
waseemabbasi22 6c3f36944a auth and attachment fixes 5 months ago
Sikander Saleem e0ad359295 system bottom navigation bar theme improvement. 5 months ago
Sikander Saleem f3539f1471 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge 5 months ago
Sikander Saleem 19ee892d67 app timer, time and date picker color improvements. 5 months ago
Sikander Saleem c1b1f37eec asset search loading ui fixed. 5 months ago
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 5 months ago
Sikander Saleem 47673e3473 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/views/components/action_button/footer_action_button.dart
#	lib/modules/cm_module/views/components/service_request_detail_view.dart
#	lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
#	lib/modules/tm_module/tasks_wo/update_task_request_view.dart
#	lib/views/pages/user/gas_refill/update_gas_refill_request.dart
#	lib/views/widgets/images/multi_image_picker.dart
5 months ago
Sikander Saleem 89865c0ddd Merge branch 'refs/heads/design_3.0_dark_mode' into design_3.0_TM_Module_attachmentFix
# Conflicts:
#	lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
#	lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
#	lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
5 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 5 months ago
WaseemAbbasi22 8d9aacb870 dark mode fixes 5 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 5 months ago
Sikander Saleem ca1ff5892e Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new_merge
# Conflicts:
#	lib/modules/cm_module/service_request_detail_provider.dart
#	lib/new_views/pages/land_page/land_page.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
6 months ago