Commit Graph

20 Commits (630c1533e753fba7776b43a51e8d4023b1784653)

Author SHA1 Message Date
Sikander Saleem 1edcea47be 1.3.6+25 merge conflict resolved. 8 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
8 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
8 months ago
WaseemAbbasi22 841fc93783 calibration tool picker fixes 8 months ago
WaseemAbbasi22 4e665d1959 attachment fixes 8 months ago
WaseemAbbasi22 6d39b20e0b dark mode implementation 8 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
8 months ago
Sikander Saleem 456432050d timezone header added, update ppm error flow improvement. 8 months ago
Sikander Saleem 3aef41a50f supplier engineer added for ppm external supplier 8 months ago
Sikander Saleem c92aae9048 improvements 9 months ago
Sikander Saleem bf44e5cbec verification method issue fixed, if requester not confirms arrival. 9 months ago
Sikander Saleem 616ce9b630 timer picker end date selection fixed. 9 months ago
WaseemAbbasi22 60979b7f95 Date picker end time fixes 9 months ago
Sikander Saleem 50eb16ce32 Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes 9 months ago
WaseemAbbasi22 aa11d93409 update user contact info bottomsheet design and statedate time initial value added 9 months ago
Sikander Saleem 4d13105b91 cancel a selection from bottom sheet dropdown added. 9 months ago
Sikander Saleem 62dd395a73 timer picker added, and code improvements 9 months ago
Sikander Saleem 2d39a6453c improvement. 10 months ago
WaseemAbbasi22 4d15dc9dab mark as complete confirmation dialog and new timer added for all type of requests 10 months ago
Sikander Saleem 5169894dc4 code restructured and improvements. 11 months ago