Commit Graph

1430 Commits (9eaae96c842c4ff823a1aef82f7f5ead4689d5b4)
 

Author SHA1 Message Date
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
2 days 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
2 days 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
2 days ago
Sikander Saleem 4bd055cfe8 merge conflict resolved. 2 days 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
2 days ago
WaseemAbbasi22 a0a084803d UI improvements 2 days ago
Sikander Saleem 520e7af640 fcm initialization changed to landing page 4 days ago
WaseemAbbasi22 73ee12cba4 Atoms-1743,1745,1748 fixes 4 days ago
WaseemAbbasi22 415bdf18f1 improvements 7 days ago
Sikander Saleem b78d10af46 current user employee id for chat. 7 days ago
WaseemAbbasi22 1c86fe71a2 improvements and added modifiedBy details 7 days ago
WaseemAbbasi22 ac50236aa2 bugs fixes 7 days ago
Sikander Saleem 7a5db103e0 api integrate cont. 1 week ago
WaseemAbbasi22 3c9688fdcb delivery notes item design updated 1 week ago
WaseemAbbasi22 3944a549b2 requested changes done 1 week ago
Sikander Saleem 45eaa0eeed app release v1.5.0+32 to stores 2 weeks ago
Sikander Saleem 45d736a64e app release v1.5.0+32 to stores 3 weeks ago
WaseemAbbasi22 e598f3b5ad chat bug fixes 3 weeks ago
Sikander Saleem af6ae868d7 improvements 3 weeks ago
WaseemAbbasi22 d57348dd92 bug fixes for site and department previously it was showing all sites not related to that specif user 3 weeks ago
WaseemAbbasi22 e303b4e099 chat bug fixes 3 weeks ago
WaseemAbbasi22 66b77c51a6 loan site bug fixes 3 weeks ago
WaseemAbbasi22 077095502e chat count implemented 3 weeks ago
WaseemAbbasi22 2425c78cf9 chat count implemented 4 weeks ago
Sikander Saleem ab6b143763 improvements 4 weeks 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
4 weeks ago
WaseemAbbasi22 c2068544db Medical Gas Inspection completed 4 weeks ago
Sikander Saleem a7c206e6f4 chat notification redirection added. 4 weeks ago
Sikander Saleem 6d6be40b9e chat notification redirection added. 4 weeks ago
Sikander Saleem a103eae1c1 demo module ui cont. 1 month ago
WaseemAbbasi22 7dd8fff34e asset delivery modules completed 1 month ago
Sikander Saleem 6d20e6f307 chat enable for cm module when engineer assigned. 1 month ago
Sikander Saleem 5faa87c1b9 Merge branch 'refs/heads/design_3.0_medical_gas_inspection' into design_3.0_demo_module 1 month ago
Sikander Saleem 282bf04094 Merge branch 'refs/heads/design_3.0_loan_module' into design_3.0_medical_gas_inspection 1 month ago
Sikander Saleem 1ebd6f2fbc Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/controllers/providers/api/all_requests_provider.dart
1 month ago
Sikander Saleem b3f8dabf2f Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module 1 month ago
Sikander Saleem 2b274f1f83 bug 1518 fixed. 1 month ago
Sikander Saleem 17210195db uat improvements. md->department, enable recall and alert for quality user. 1 month ago
Sikander Saleem 9637909531 demo module starting... 1 month ago
Sikander Saleem 86f96a8f62 medical gas ui added. 1 month ago
Sikander Saleem db2175b7f5 quality auditor role added. 1 month ago
Sikander Saleem d765bf0b83 medical gas cont. 1 month ago
Sikander Saleem 883210e61b merge conflict fixed 1 month ago
Sikander Saleem ea05e965d5 Merge branch 'refs/heads/design_3.0_cx_module' into design_3.0_loan_module
# Conflicts:
#	lib/modules/tm_module/device_transfer/device_transfer_details.dart
#	lib/views/widgets/gas_refill/gas_refill_list.dart
1 month ago
Sikander Saleem 58ff17e008 Merge branch 'refs/heads/design_3.0_internal_audit_module' into design_3.0_cx_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
1 month ago
Sikander Saleem 7d7a34a6d5 Merge branch 'refs/heads/design_3.0_traf_module' into design_3.0_internal_audit_module 1 month ago
Sikander Saleem 16de0eaa41 Merge branch 'refs/heads/design_3.0_asset_inventory_module' into design_3.0_traf_module
# Conflicts:
#	lib/controllers/api_routes/urls.dart
1 month ago
Sikander Saleem e1efd59252 request no, md and site details, remove item if no finding selected and dashboard api added for quality user. 1 month ago
Sikander Saleem 4b991d807c v1.4.0+31 uploaded on stores. 1 month ago
Sikander Saleem f2ebadf1b7 attachment list view added in files list widget. 1 month ago