Commit Graph

83 Commits

Author SHA1 Message Date
Simon Birnbach a384fcb99f Merge git://gitorious.org/owncloud/owncloud
Conflicts:
	files/css/files.css
	files/js/files.js
2012-04-15 15:59:57 +02:00
Bart Visscher 71b70bb05f Fix HTML, misspelled span close tag 2012-03-30 23:41:54 +02:00
Arthur Schiwon e2fd0bbf02 IE 8: fix appeareance of checkboxes on login and files pages 2012-03-29 18:32:25 +02:00
Simon Birnbach 4e89a0faf6 Added uploading to folder and cancellable downloads 2012-03-27 21:38:55 +02:00
Arthur Schiwon d91bc9b317 use placeholder in template file 2012-03-21 13:10:02 +01:00
Arthur Schiwon 7c815054c7 Config file is more appropriate here
adjust default value
2012-03-21 13:05:15 +01:00
Arthur Schiwon b13ab2b17e enable admin to turn off ZIP downloads
user interface offers multi-file/folder downloads only if available

make function name more clear
2012-03-19 11:56:02 +01:00
Simon Birnbach b1a33110fc Added global progressbar for all uploads 2012-03-17 22:20:39 +01:00
Robin Appelman 018f0c4b72 add option to add file from url 2012-03-07 21:43:44 +01:00
Robin Appelman 7b9fb84fe9 Merge branch 'master' into filesystem 2012-02-02 17:30:54 +01:00
Marvin Thomas Rabe e4faea8f90 Fixed upload button display error 2012-02-01 20:58:04 +01:00
Robin Appelman 7ff86cfebe provide live feedback while scanning files 2012-01-31 13:56:58 +01:00
Robin Appelman 96e2f15d8a merge master into filesystem 2012-01-16 03:06:11 +01:00
Robin Appelman 125731cab0 fix uploading to subfolders 2012-01-10 16:48:29 +01:00
Michael Gapczynski 9d9f254c78 Quick fix for file actions inside Shared folder (or other readonly folder) 2012-01-09 16:45:52 -05:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Robin Appelman dc641943d9 fix some display issues for readonly folders 2011-12-16 17:39:15 +01:00
Robin Appelman 524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Robin Appelman e55c5c590e make 'New' button work with firefox 2011-11-04 16:16:54 +01:00
Jan-Christoph Borchardt 0c890a501c upgraded the new new button. Didn't and doesn't work in Firefox though 2011-10-23 21:51:56 +02:00
Robin Appelman d46288b0ab 'New' button, needs some css work 2011-10-23 11:40:40 +02:00
Tom Needham 0825073e8c Editor now loads on top of files app. 2011-10-01 22:48:00 +01:00
Florian Pritz d928cd3636 files: hide non functioning code when called from a/f_s/get.php
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.

The actions div contains undefined variables and doesn't work either.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:54 +02:00
Florian Pritz 652b744201 don't print empty folder warning if it will be hidden
No point in wasting resources if you don't show it.

This also fixes an undefined variable notice.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:49 +02:00
Florian Pritz 2ff5df192b files: fix wrong image paths if called from files_shareing/get.php
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:48 +02:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Michael Gapczynski 122018889a Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
2011-08-12 21:00:41 -04:00
Robin Appelman 9ba303a95f fix uploading multiple files 2011-08-12 11:50:07 +02:00
Jan-Christoph Borchardt 6c4d075bd6 added jquery-tipsy for nice title tooltips 2011-08-12 11:26:13 +02:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Dawid Opis 11b3c10cc6 resolved merge conflicts 2011-08-11 22:29:48 +02:00
Dawid Opis 9683d44633 fixed upload button 2011-08-11 22:22:32 +02:00
Robin Appelman 0bcb4a6a8f set default max upload size in the .htaccess file to something rediculous
and don't show the max filesize message when the limit is over 10GB
2011-08-11 21:00:18 +02:00
Robin Appelman dfb923f34e automatically set background images to png when needed 2011-08-11 20:36:31 +02:00
Jan-Christoph Borchardt 6af4c2dd0f moved search box directly to template 2011-08-10 23:02:41 +02:00
Bartek Przybylski ec31a29b3c Bug 279826 fix 2011-08-10 20:12:42 +02:00
Michael Gapczynski e1bde1a78e Merge branch 'master' into sharing
Conflicts:
	files/templates/index.php
2011-08-10 13:40:47 -04:00
Jan-Christoph Borchardt f754d6dc51 lots of CSS details 2011-08-10 15:11:26 +02:00
Robin Appelman 9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Michael Gapczynski ec6aed8475 Merge branch 'master' into sharing 2011-08-09 10:42:50 -04:00
Jan-Christoph Borchardt 3b34cba4ae first mediaplayer styling 2011-08-08 21:40:39 +02:00
Jan-Christoph Borchardt b9ce564053 Merge branch 'master' into sharing 2011-08-08 13:04:10 +02:00
Jan-Christoph Borchardt ecd2738e83 fixed upload button 2011-08-08 12:48:43 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Robin Appelman e209511f86 provide undo button when deleting files from the web interface 2011-08-04 00:22:44 +02:00
Michael Gapczynski f0c1f38f98 Add share action for mutliple selected files 2011-07-29 15:43:29 -04:00
Robin Appelman 2781fdeed8 automatically replace svg images with png for browsers that dont support svg 2011-07-29 17:51:38 +02:00
Robin Appelman 468319fe04 no need for an ok button for creating folders 2011-07-29 02:37:17 +02:00
Robin Appelman c73dd86713 confirmation dialogs for deletions 2011-07-29 00:26:23 +02:00
Jan-Christoph Borchardt 43f99a8983 finished action icons on hover, small style improvements 2011-07-28 12:14:55 +02:00