Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/js/filelist.js		2013-09-19 17:00:54 +02:00
..
admin.js	move files to app folder	2012-04-18 17:27:34 +02:00
file-upload.js	Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog	2013-09-19 11:33:34 +02:00
fileactions.js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
filelist.js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
files.js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
jquery-visibility.js	fixing undefined originalEvent	2013-02-14 12:19:50 +01:00
jquery.fileupload.js	architecture too complex	2013-08-21 14:58:28 +02:00
jquery.iframe-transport.js	architecture too complex	2013-08-21 14:58:28 +02:00
keyboardshortcuts.js	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
upgrade.js	Cache: show upgrade progress	2013-01-15 18:13:50 +01:00
upload.js	Files: fix moving files by DnD	2013-01-31 17:56:44 +01:00