owncloud/core — pull request #3904 by icewind1991 (2013-07-01 14:22:15+00:00)
Title: Fix cancel action when uploading existing files

This is a partial fix for #3728 and fixes the behaviour of the "cancel" button when uploading a file that already exists.

However when uploading multiple existing files the notification only allows to cancel or replace one of the conflicting files (the other files are always "suggest new name") @MTGap I believe this was your work?

Only stable5 is currently effected since master doesn't show the notification at all (maybe related to the upload cleanup @butonic ?), should be cherry-picked into master after merge anyway.

cc @karlitschek @DeepDiver1975