Jörn Friedrich Dreyer
|
4af5a8c483
|
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
|
2013-09-04 14:11:40 +02:00 |
|
Jörn Friedrich Dreyer
|
9da49264ea
|
change filelist ui updates
|
2013-08-14 17:49:45 +02:00 |
|
Jörn Friedrich Dreyer
|
e1927d5bee
|
fix whitespace, check selected files before starting upload
|
2013-08-14 10:55:12 +02:00 |
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
Thomas Tanghus
|
901b1150ff
|
Replacement for jquery.dialog to fit better with ownCloud design.
|
2013-06-02 21:52:59 +02:00 |