Commit Graph

565 Commits (7020b9b36e55e261470d9e0444b3bc2fc6278fc8)

Author SHA1 Message Date
Sikander Saleem 2e3736cdc9 Merge branch 'design_3.0_loan_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/models/generic_attachment_model.dart
#	lib/modules/loan_module/pages/loan_equipment_detail_page.dart
1 day ago
Sikander Saleem 188df51ce3 spare cost added on cm detail 1 day ago
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
1 day ago
Sikander Saleem 619c643367 Merge branch 'refs/heads/design_3.0_eng_role_module' into design_3.0_demo_module 1 day ago
Sikander Saleem 71dfcde5a1 Merge branch 'refs/heads/design_3.0_rota_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
1 day 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
1 day ago
Sikander Saleem 4b44a41598 demo request cancellation added. 6 days ago
Sikander Saleem 4fdd04b106 unread messages api added. 1 week ago
Sikander Saleem e16add345d document lookup changed. 1 week ago
Sikander Saleem 67f9081f50 ovr ticket information added. 1 week ago
Sikander Saleem 67da263e0d loan improvements 1 week ago
Sikander Saleem 0a06edd883 improvements 2 weeks ago
Sikander Saleem 31a9296a8e improvements 2 weeks ago
Sikander Saleem f0d79da6db release config added. 2 weeks ago
Sikander Saleem 9dc19354a2 hide loan for release 2 weeks ago
Sikander Saleem f6a433ca09 Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 weeks ago
Sikander Saleem ce873d99a5 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
2 weeks ago
Sikander Saleem 6cf051e66e incident detail page addded. 2 weeks ago
Sikander Saleem cb2329a6c2 incident create request completed. 2 weeks ago
Sikander Saleem 58ee00b00a incident module dev -1 2 weeks ago
Sikander Saleem 1a2845337b improvements 3 weeks ago
Sikander Saleem 8db4094716 assign to me & cancel added for asset transfer. 3 weeks ago
Sikander Saleem b14130e6c7 Merge branch 'design_3.0_rota_module' into design_3.0_eng_role_module
# Conflicts:
#	lib/views/pages/user/profile_page.dart
3 weeks ago
Sikander Saleem d993a22b39 monthly calender added for rota 3 weeks ago
Sikander Saleem 0f4a409780 assign to me added ion gas refill and tasks 3 weeks ago
Sikander Saleem 594fabd51a uat apk provided 4 weeks ago
Sikander Saleem 8f2e9db062 existing loan check api added. 4 weeks ago
WaseemAbbasi22 60051af331 Merge remote-tracking branch 'origin/design_3.0_demo_module' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/modules/demo_module/create_demo_request_page.dart
#	lib/modules/demo_module/demo_provider.dart
4 weeks ago
WaseemAbbasi22 1e158e8bd4 update form changed 4 weeks ago
Sikander Saleem cea77ff7f7 evaluation form added. 4 weeks ago
Sikander Saleem 3372f7d38d demo attachment document type added. 4 weeks ago
WaseemAbbasi22 afa165dc3d added vendor dropdown along with free text 4 weeks ago
WaseemAbbasi22 938f5173a4 improvements 1 month ago
WaseemAbbasi22 5d856fc46b improvements 1 month ago
WaseemAbbasi22 e0ed594072 API's implemented 1 month ago
WaseemAbbasi22 bf4d2a3257 Merge remote-tracking branch 'origin/design_3.0_asset_delivery_module' into design_3.0_asset_delivery_module 1 month ago
WaseemAbbasi22 0908cda2b0 Ui improvement and delivery inspection new apis implemented 1 month ago
Sikander Saleem c377c67f40 rota module added. 1 month ago
Sikander Saleem 6f43fd777a user shift information added. 1 month ago
Sikander Saleem 9eaae96c84 Merge branch 'design_3.0_medical_gas' into design_3.0_demo_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.dart
#	lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
#	lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
#	lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart
1 month ago
Sikander Saleem 178309eb1e Merge branch 'design_3.0_asset_delivery_module' into design_3.0_medical_gas
# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	lib/main.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 da85a2b639 Merge branch 'design_3.0_loan_module' into design_3.0_asset_delivery_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
1 month ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 1 month 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
1 month ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 1 month ago
WaseemAbbasi22 ac50236aa2 bugs fixes 1 month ago
Sikander Saleem 7a5db103e0 api integrate cont. 1 month ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 1 month ago
WaseemAbbasi22 3944a549b2 requested changes done 1 month ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 2 months ago