Commit Graph

446 Commits (188df51ce3ee28ccffebae2845c4b5fe6587bf83)

Author SHA1 Message Date
Sikander Saleem 65c0566eef Merge branch 'design_3.0_incident_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/new_views/common_widgets/single_item_drop_down_menu.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
#	lib/new_views/pages/land_page/requests/request_paginated_listview.dart
#	lib/new_views/pages/land_page/widgets/request_item_view_list.dart
7 months ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 7 months ago
Sikander Saleem 64fbf46b82 Merge branch 'refs/heads/design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.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
7 months ago
Sikander Saleem c81d3181d2 acknowledgment added for demo request creation. 7 months ago
Sikander Saleem 9226fe3ac7 asset room number 8 months ago
Sikander Saleem 4d5f001cd2 dropdown last item overlapping with navigation bar 8 months ago
Sikander Saleem cdc69fcee0 asset scan user feedback if not found. 8 months ago
Sikander Saleem 267a4445d1 ui improvements 8 months ago
Sikander Saleem c50e979790 keyboard dismiss issue fixed. 8 months ago
Sikander Saleem 1a2845337b improvements 8 months ago
Sikander Saleem 0f4a409780 assign to me added ion gas refill and tasks 8 months ago
Sikander Saleem c69bcc2843 improvement. 8 months ago
Sikander Saleem 3372f7d38d demo attachment document type added. 8 months ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 9 months ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 9 months ago
Sikander Saleem da85a2b639 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
Sikander Saleem 48b4b5e368 Merge branch 'design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/notification/firebase_notification_manger.dart
#	lib/modules/cm_module/cm_detail_page.dart
#	lib/modules/cx_module/chat/chat_widget.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
#	lib/new_views/pages/land_page/requests/service_request_item_view.dart
#	lib/views/pages/user/requests/pending_requests_screen.dart
9 months ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 9 months ago
Sikander Saleem 9f670d4a0b Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
9 months ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 10 months ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 10 months ago
Sikander Saleem 4763132302 attachment as listview added. 10 months ago
Sikander Saleem 5ff9fc5808 chat added gas refill, transfer asset internal & external, task request. 10 months ago
Sikander Saleem b407103002 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module 10 months 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
10 months ago
waseemabbasi22 2962f248e0 timer fixes 10 months ago
Sikander Saleem 1a3861d816 files refactoring 11 months ago
Sikander Saleem 16a2fa2b26 files refactoring 11 months ago
Sikander Saleem 62cc13b1c0 standard / backup loan request creation. 11 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
11 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
11 months ago
WaseemAbbasi22 542070c791 improvements 11 months ago
Sikander Saleem 7445902564 chat attachment added. 11 months ago
Sikander Saleem c5b4325aec survey notification finalized. 11 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
11 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
11 months ago
Sikander Saleem d48fdfaaa5 Merge branch 'refs/heads/design_3.0_TM_Module_snagsFix' into design_3.0_data_segregation 11 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
11 months ago
Sikander Saleem 985d559860 ppm update button hide for end user. & status color changed. 12 months ago
Sikander Saleem 76acdddabc asset by oracle code api added, departments lookup added. 12 months ago
Sikander Saleem d3c000004e code improvements 1 year ago
Sikander Saleem 56328b81b4 traf module added, create, view details, update. cont 1 year ago
WaseemAbbasi22 8578319cc3 asset inventory module ready for qa 1 year ago
Sikander Saleem dfef9aadb7 Merge branch 'refs/heads/design_3.0_task_module_new_merge' into design_3.0_asset_inventory_module 1 year ago
Sikander Saleem a9973047d6 improvement 1 year ago
WaseemAbbasi22 e5775019a4 asset inventory design 1 year ago
Sikander Saleem 4d035e9c46 android AGP upgraded & enhancement. 1 year ago
Sikander Saleem 3ac3c11b4b improvement 1 year ago
WaseemAbbasi22 423968d7f6 timer history added 1 year ago
Sikander Saleem f9c7d335e2 file format. 1 year ago