Commit Graph

490 Commits

Author SHA1 Message Date
Tom Needham 3f67918522 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2012-01-09 21:17:41 +00:00
Robin Appelman d1edc360d9 merge master into filesystem 2012-01-08 01:53:40 +01:00
Tom Needham 6dcabdc61c Fixed merge conflict in /files/ajax/move.php 2012-01-04 16:31:06 +00:00
Tom Needham ebe3ae58cf removed data-read and fixed droppable logic 2012-01-02 18:08:20 +00:00
Tom Needham 0730077840 Used data-read and data-wite when binding drag and drop events 2012-01-02 17:07:10 +00:00
Tom Needham 39a7bd9c00 Added data-read and data-write attributes to file list 2012-01-02 17:02:30 +00:00
Michael Gapczynski 470bab9c68 Fix typo in move error message 2012-01-01 18:45:26 -05:00
Tom Needham cbb2db8622 Fix merge conflicts 2012-01-01 01:18:02 +00:00
Tom Needham e7de254342 Fix missing ; 2012-01-01 01:14:00 +00:00
Tom Needham 06d2a87ee4 Fix js error 2012-01-01 00:52:53 +00:00
Tom Needham 2c4ab355ac Shared folder no longer draggable or droppable 2012-01-01 00:47:24 +00:00
Tom Needham 8efec8e900 Remove repeated code 2011-12-31 12:23:08 +00:00
Tom Needham 5a5b216ba0 Fixed error message 2011-12-30 23:20:44 +00:00
Michael Gapczynski 86b65c269a Keep the urls pretty, decode forward slashes for newly added directories 2011-12-28 13:01:36 -05:00
Michael Gapczynski 9b59bf40df Fix encoding again and update the link after renaming files 2011-12-28 12:47:27 -05:00
Michael Gapczynski 1cddfe8820 Keep the urls pretty, decode forward slashes 2011-12-27 12:43:58 -05:00
Michael Gapczynski 95b9f4ed23 Fix folder names with + characters in it 2011-12-27 12:35:29 -05:00
Robin Appelman 1fe55b6656 fix upload error reporting 2011-12-23 19:49:02 +01:00
Michael Gapczynski 9bb004963b Fix whitespace folder name 2011-12-23 12:28:44 -05:00
Robin Appelman dc641943d9 fix some display issues for readonly folders 2011-12-16 17:39:15 +01:00
Robin Appelman 9fdd1bafdc Merge branch 'master' into filesystem 2011-12-11 23:42:22 +01:00
Robin Appelman a0548a416a Don't trigger file action when renaming, stupid fix for stupid firefox behaviour 2011-12-05 23:52:14 +01:00
Robin Appelman a8e4d2946a Merge branch 'database' into filesystem 2011-11-26 01:25:08 +01:00
Bart Visscher 2dd757156c Fix file dropping on root (Files menu entry) 2011-11-23 21:31:27 +01:00
Robin Appelman 5a8235eca0 use force parameter 2011-11-10 16:54:45 +01:00
Robin Appelman 524e3686a0 tell the user when the files are being scanned 2011-11-10 16:40:09 +01:00
Robin Appelman 5a6aba1e11 provide caching for file metadata 2011-11-09 18:41:57 +01:00
Robin Appelman 2bd28acdc6 take free disk space (and user quota) into account for max upload size 2011-11-08 22:48:29 +01:00
Robin Appelman 5cc6635eb8 remove OC_Filesystem::fromUploadedFile 2011-11-08 22:36:05 +01:00
Brice Maron 2fa9e3279c Manage More special chars in file listings. ';' is still problematic 2011-11-06 13:50:05 +01:00
Brice Maron 8de7c36b4c Fix broken upload since merge of new button branch 2011-11-06 13:34:22 +01:00
Brice Maron 75ff9abaca Fix another problem of the so-called 'fix-special chars' commit. 2011-11-06 00:39:11 +01:00
Brice Maron b3bb83cf58 Do not use mix data/attr to retrieve filename ... data() will try to convert filename to int 2011-11-04 23:44:41 +01:00
Robin Appelman e55c5c590e make 'New' button work with firefox 2011-11-04 16:16:54 +01:00
Robin Appelman 9a049de85f fix mimeicon for new files 2011-11-04 03:11:29 +01:00
Robin Appelman bf18568e17 small styling fix for New button 2011-11-04 03:08:00 +01:00
Robin Appelman 2c68aab198 Merge branch 'master' into newbutton 2011-11-04 03:00:03 +01:00
Brice Maron 13d2c5e926 Fix bug with spaces in file names. 2011-11-02 20:26:17 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +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
Michael Gapczynski aa087f8661 Change javascript new folder from old icon to new 2011-10-22 02:11:32 -04:00
Michael Gapczynski 50bf7a98c2 Redirect file browser if directory does not exist 2011-10-22 01:50:40 -04:00
Jan-Christoph Borchardt 4c256433c0 removed '/' from file path because only Unix people understand the concept of that. Plus, 'Files' itself is the root. 2011-10-22 00:30:01 +02:00
Brice Maron 8c7fc03296 Correct unknown breadcrumb add '/' permanantly in it and DRY code for last breadcrumb 2011-10-21 23:30:12 +02:00
Jan-Christoph Borchardt c420001f2b bold current folder in breadcrumbs 2011-10-21 21:00:26 +02:00
Jan-Christoph Borchardt 92ba000f09 only show checkbox on hovering filetype icon 2011-10-21 21:00:26 +02:00
Jan-Christoph Borchardt 43c28b941b hopefully finally fixed the initial breadcrumb arrow 2011-10-21 21:00:26 +02:00
Brice Maron 3c5a6a356a Use notification to inform about errors in file list. 2011-10-17 20:39:01 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman b0127e3918 use OC_Log instead of error_log 2011-10-16 21:42:24 +02:00
Georg Ehrke a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Robin Appelman d7fa2a0f77 mimetype icon improvements 2011-10-13 16:33:39 +02:00
Tom Needham 538abb99f1 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:10:50 +01:00
Robin Appelman 1f562a2e83 fixes for the mimetype icons 2011-10-07 18:09:49 +02:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Tom Needham d9464de690 Updated saving feedback 2011-10-05 21:59:03 +01:00
Tom Needham edd958836e Moved addScript and addStyle calls to app.php 2011-10-05 16:32:01 +01:00
Robin Appelman 1fba8619d4 move some code to where it belongs and remove duplicated editor app 2011-10-05 02:36:54 +02:00
Marvin Thomas Rabe 7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00
Tom Needham 02d7b1a1fc Added breadcrumb and control bar. 2011-10-03 22:59:40 +01:00
Tom Needham 0825073e8c Editor now loads on top of files app. 2011-10-01 22:48:00 +01:00
Robin Appelman 51e68729de escape file and directory names when downloading files 2011-09-30 10:59:46 +02:00
Thomas Schmidt 387b94b740 fix check for success 2011-09-29 15:53:31 +02:00
Robin Appelman dded8ab27d fix small styling problem with playback controlls 2011-09-28 22:39:15 +02:00
Tom Needham bc7289bb28 Changed theme. Editing is now default action for all supported types. Fixed static url. 2011-09-28 21:25:25 +01:00
Robin Appelman 1639a1ca49 fix persistent playlist for media player 2011-09-28 22:21:06 +02:00
Tom Needham 1f74e76d83 Implemented ace-edtior as an app. Basic file editing and saving supported. 2011-09-28 15:15:04 +01:00
Scott Barnett 83ccbbe49f Fixed table gap from appearing. 2011-09-27 06:48:05 +10:00
Bart Visscher 17e631bc5e Use OC_JSON for json responses
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Scott Barnett dbddec9160 Fixed minor issue. 2011-09-26 04:18:33 +10:00
Scott Barnett 1985bfd9eb Fixed uploaded file hover issue. 2011-09-26 04:08:28 +10:00
Jan-Christoph Borchardt 700ac75565 updated translations 2011-09-24 23:12:18 +02:00
Florian Pritz 152fc7d94d files: fix max filesize check
php check both, upload_max_filesize and post_max_size, when uploading a
file so we should do the same when figuring out the maximum size.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:06 +02:00
Florian Pritz ef07b599cb files/ajax: catch upload errors
If the file wasn't uploaded successfully bail early.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:05 +02:00
Florian Pritz c7d4e72341 set cookie secure if forcessl is enabled
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02: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
Florian Pritz 8648e3c43c only call error_log() if DEBUG is true
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Jan-Christoph Borchardt 5559a0dede updated translations 2011-09-23 19:08:02 +02:00
Jakob Sack 73d0caf8a4 Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging 2011-09-23 09:40:01 +02:00
Robin Appelman 917ea58a8c fix file uploads for IE 2011-09-22 23:25:23 +02:00
Bart Visscher e990ef3542 Move some common code to OC_Util
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Bart Visscher 82c7598861 Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Jan-Christoph Borchardt 1bf215cd08 updated translations 2011-09-03 15:08:58 +02:00
Robin Appelman e89a4b3a0d Fix bug: filenames in filelisting are not shown for files without extension
patch by Elias Probst
2011-08-30 20:23:39 +02:00
Michael Gapczynski be4cb55368 Fix newly uploaded files names being cut off if multiple '.' 2011-08-28 15:39:17 -04:00
Michael Gapczynski affc879cde Shift+Click multiselect for files 2011-08-28 15:21:53 -04:00
Michael Gapczynski a695aa3071 Months for modified date need to be translated 2011-08-28 14:21:36 -04:00
Michael Gapczynski 5f0ab971f1 Ctrl+Click on td.filename a selects file instead of default file action 2011-08-28 14:15:07 -04:00
Michael Gapczynski 0c0435615d Support translations for modified date column in files 2011-08-28 11:44:33 -04:00
Michael Gapczynski fef7e9d5f4 Style changes for multiselect and add tipsy for file size 2011-08-27 22:16:39 -04:00
Michael Gapczynski 2b572f676d Fix file actions broken in some browsers, rename delete to do_delete - Thanks Bart Visscher 2011-08-27 19:32:48 -04:00
Michael Gapczynski 9353d1de74 Get file extension using lastIndexOf instead of indexOf in case there is a '.' in file name 2011-08-24 20:34:27 -04:00
Jan-Christoph Borchardt d40b905f27 Revert "hints for file actions"
1) Please test in Firefox 2) File actions should be refactored first, to be shown/hidden via CSS, not via JavaScript
This reverts commit e78d1dd676.
2011-08-23 11:45:28 +02:00
Bartek Przybylski e78d1dd676 hints for file actions 2011-08-22 19:33:21 +02:00
Robin Appelman d5ba4ec825 some improvements in automatic svg replacement 2011-08-22 15:20:24 +02:00
Robin Appelman 043e62ffd9 fix uploading files to the users root directory 2011-08-21 14:28:44 +02:00
Jan-Christoph Borchardt 3f8e4e2a30 added controls bar for Apps and Help 2011-08-21 11:14:57 +02:00
Michael Gapczynski ceae4fa7b4 Fix bugs preventing file upload in shared folders with write permission 2011-08-20 12:36:20 -04:00
Jan-Christoph Borchardt d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Michael Gapczynski d1aebcddf2 Add downloadURL to files templates for both public links and files 2011-08-18 19:32:24 -04:00
Michael Gapczynski 498356fcb8 Copy get.php into files_sharing, public links now use files templates 2011-08-18 15:35:31 -04:00
Jan-Christoph Borchardt 4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Jan-Christoph Borchardt 2ee9e80afe Swedish translation, thanks to HakanS 2011-08-18 14:33:05 +02:00
Jan-Christoph Borchardt e8951b7a2d still show the icon on row hover so the file type is still visible 2011-08-18 12:54:10 +02:00
Jan-Christoph Borchardt 6720a45d65 updated translations 2011-08-18 11:46:49 +02:00
Robin Appelman 462fe1e56b fix default file actions not working 2011-08-17 00:21:12 +02:00
Michael Gapczynski 1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Michael Gapczynski 70405cc80e Modify files css for sharing dropdown to avoid future merge conflicts 2011-08-15 17:47:54 -04:00
Robin Appelman 6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00
Jan-Christoph Borchardt 2cb231d0a4 resolved merge conflict 2011-08-14 19:31:38 +02:00
Jan-Christoph Borchardt 7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Jan-Christoph Borchardt 6e30ade0b3 updated tipsy, tooltips finally work everywhere, thanks icewind 2011-08-14 14:55:43 +02:00
Jan-Christoph Borchardt 6eabee3dfd small CSS changes 2011-08-13 18:22:40 +02:00
Jan-Christoph Borchardt 1f98f5cfda wayyy better position for file upload and new folder 2011-08-13 16:54:54 +02:00
Jan-Christoph Borchardt 7474c907dc CSS update, Personal looks better now 2011-08-13 15:32:00 +02:00
Jan-Christoph Borchardt 2ba3793671 updated translations 2011-08-13 12:43:15 +02:00
Jan-Christoph Borchardt 3b5f16b23c NEEDS MORE FADING 2011-08-13 06:05:00 +02:00
Jan-Christoph Borchardt d5b4056514 fixed tipsy tooltips for actions 2011-08-13 05:40:03 +02:00
Jan-Christoph Borchardt 7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt b2768637d2 updated translations 2011-08-13 05:13:35 +02:00
Michael Gapczynski 122018889a Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
2011-08-12 21:00:41 -04:00
Jan-Christoph Borchardt 21690a3702 tweaked CSS fade transitions 2011-08-13 01:18:02 +02:00
Robin Appelman 42c5a24dc3 more fancy fading 2011-08-13 00:23:15 +02:00
Jan-Christoph Borchardt 02824cabfe removed downloading as fallback action when file type can not be opened 2011-08-12 11:55:11 +02:00
Jan-Christoph Borchardt f62b315159 file hovering now very fancy, CSS fade for row and extension 2011-08-12 11:51:48 +02: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
Jan-Christoph Borchardt db4fccce51 styled hovering file list more subtle 2011-08-12 01:53:24 +02:00
Michael Gapczynski d78b75a0d1 Merge branch 'master' into sharing 2011-08-11 17:43:43 -04:00
Michael Gapczynski 4830555cce Merge branch 'master' into sharing
Conflicts:
	.gitignore
2011-08-11 17:42:37 -04:00
Jan-Christoph Borchardt 577f2952bd action icons are now ACTION ICONS 2011-08-11 23:38:50 +02:00
Robin Appelman 972f7d7e60 forgot something 2011-08-11 23:23:59 +02:00
Robin Appelman ae7d9143f4 allow dynamicly determaning icons for fileactions 2011-08-11 23:21:30 +02: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
Jan-Christoph Borchardt ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +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
Michael Gapczynski c65046773d Make unshare work from dropdown 2011-08-11 14:20:50 -04:00
Jan-Christoph Borchardt 99790d6805 lots of image changes, use svg EVERYWHERE POSSIBLE 2011-08-11 19:00:32 +02:00
Frank Karlitschek c824572b91 fix the getlink calls 2011-08-11 16:15:55 +02:00
Jan-Christoph Borchardt b4e89871dd merged master into sharing 2011-08-11 13:29:22 +02:00
Dawid Opis fa61279e45 fixed upload button overlapping new folder input 2011-08-11 00:03:26 +02:00
Jan-Christoph Borchardt 1128b15833 fixed navigation and breadcrumb graphics 2011-08-10 23:44:18 +02:00
Jan-Christoph Borchardt 225d000491 I don't always test my code. But when I do, I do it in production. 2011-08-10 23:26:25 +02:00
Jan-Christoph Borchardt bdba88d7f6 damn z-index 2011-08-10 23:12:41 +02:00
Jan-Christoph Borchardt 90136b6e0a fix search, sane z-indexes 2011-08-10 23:09:29 +02:00