fix whitespace, check selected files before starting upload
change filelist ui updates
add triangle icon east
progress fixes
architecture too complex
reduced complexity, added listing conflicts to dialog
More trimming
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
initial commit, start implementing the ocs share api
refactor dialog creation
intermediate results, share api
Use proper controller naming
Merge branch 'master' into appframework-master
adding public interface for preview
Have login-checks and CSRF checks
use avconv instead of ffmpeg
separate uploading code from progress code, add progress capability detection
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/js/file-upload.js
more is_resource checks before readdir
Merge branch 'master' into sharing_mail_notification_master

increased version number to trigger db update

Conflicts:
	lib/util.php