Clone
 

joe <jjohn@parts-unltd.com> in lemans-dashboard-price-calc

Merge branch 'sprint-84'

Merge branch 'SD-20858-DELETE-DATE' into sprint-84

SD-20858: modified to handle delete date

Merge branch 'sprint-82'

Merge branch 'SD-21672_CALCPRO_ISSUES' into sprint-82

SD-21672: added pageSize param

Merge remote-tracking branch 'origin/SD-19582_Vendor_Tab_Implement_Server_Side_Sorting' into PTR-146-merge

Merge branch 'MAINT_SD-18809_convert_pricing_button_to_link' into sprint-69

SD-18809: modified to use link instead of buttons

Merge branch 'sprint-69' into MAINT_SD-18809_convert_pricing_button_to_link

DON'T MERGE WITH SPRINT-69

Merge branch 'sprint-69' into MAINT_SD-18046_storing_state_among_tabs

Merge branch 'MAINT_SD-18682_SET_DEFAULT_PAGINATION_SIZE' into sprint-69

SD-18682: added pagination to vendorlist page

Merge branch 'MAINT_SD-18682_SET_DEFAULT_PAGINATION_SIZE' into sprint-69

SD-18682: set default pages to 100 where it was previously 25

Merge branch 'sprint-68' into MAINT_SD-18046_load_parts_by_default

Merge branch 'MAINT_SD-18128_bulk-delete-issue' into sprint-67

SD-18128: looks like it was happening since a section was not selected; as a fix added flash warning message to let the user know that they should select a section first;

Merge branch 'MAINT_SD-18046_load_parts_by_default' into sprint-67

SD-18046: checking in the changes again

Merge branch 'MAINT_SD-18046_load_parts_by_default' into PTR_remove-php-proxy

Revert "Merge branch 'MAINT_SD-18046_load_parts_by_default' into PTR_remove-php-proxy"

This reverts commit 917664f0eae4baab4eb5caaa4cf64c783a999e81.

SD-18046: triggering search by default

Merge branch 'MAINT_SD-17928_nw-catalog-health-status' into sprint-66

SD-17928: added new health status

Merge branch 'APPDEV-8453' into pcu-rewrite

APPDEV-8453: modified filter groups to use standard dynamic filter group component