Jörn Friedrich Dreyer
|
b59ce403d8
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
|
2013-09-17 19:10:46 +02:00 |
|
Jörn Friedrich Dreyer
|
7854cf04ee
|
refactor upload js & html to always use only js to fill form data
|
2013-09-13 17:07:52 +02:00 |
|
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 |
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
Jörn Friedrich Dreyer
|
f94e603698
|
progress fixes
|
2013-08-16 11:40:55 +02:00 |
|
Georg Ehrke
|
41ba155a14
|
fix js error
|
2013-08-07 11:58:49 +02:00 |
|
Georg Ehrke
|
91bd4dd67b
|
implement previews of single shared files
|
2013-08-07 11:48:08 +02:00 |
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
Thomas Müller
|
0c2ebb984e
|
adding tipsy to the upload button showing the max upload and restoring client side upload size validation
|
2013-07-05 15:07:05 +02:00 |
Roman Geber
|
ddb0ff346d
|
Public upload feature
|
2013-06-25 12:24:14 +02:00 |
Björn Schießle
|
0d081ac5ac
|
register download action for directories
|
2012-10-05 14:28:23 +02:00 |
|
Björn Schießle
|
ef8a4a1629
|
register download action for files
|
2012-10-05 14:28:23 +02:00 |
Michael Gapczynski
|
39e587b52c
|
Remove the content and table to prevent covering the download link
|
2012-09-19 00:27:53 -04:00 |
|
Michael Gapczynski
|
749b5b52ca
|
Show preview for public folder links
|
2012-09-18 23:56:14 -04:00 |
|
Jörn Friedrich Dreyer
|
3ba27e624f
|
unify permissions (2/3): change apps to use OC::PERMISSION_X
|
2012-08-31 01:11:10 +02:00 |
|
Michael Gapczynski
|
f2534e7428
|
Show notification that no preview is available if no previewer is found for a public link to a file
|
2012-08-29 21:12:23 -04:00 |
|
Michael Gapczynski
|
0a9d1ed3a6
|
Initial previewer for public links
|
2012-08-27 20:37:38 -04:00 |