fix bug 1817
modify cancel option when push files
fix bug 1875
modify error message