Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ...

Conflicts:
	apps/files_encryption/tests/keymanager.php

2013-08-17 13:15:22 +02:00

..

admin.js

move files to app folder

2012-04-18 17:27:34 +02:00

file-upload.js

Added file-upload to GIT repo

2013-06-26 22:51:38 +02:00

fileactions.js

Merge pull request #4113 from owncloud/delete-fix

2013-08-15 15:31:42 -07:00

filelist.js

Merge pull request #4113 from owncloud/delete-fix

2013-08-15 15:31:42 -07:00

files.js

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

jquery-visibility.js

fixing undefined originalEvent

2013-02-14 12:19:50 +01:00

jquery.fileupload.js

move files to the correct place

2012-04-26 21:24:41 +02:00

jquery.iframe-transport.js

move files to the correct place

2012-04-26 21:24:41 +02:00

keyboardshortcuts.js

prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup

2012-12-12 12:55:29 +01: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