summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\ | | | | Fixed zip download button for unlimited filesize in public mode
| * Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
| | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717
* | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-174-7/+25
|/ | | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977
* Merge pull request #5378 from owncloud/files-permissionsafteruploadfixMorris Jobke2013-10-171-2/+7
|\ | | | | Fixed upload permissions distinction between public and logged in upload
| * Fixed upload permissions distinction between public and logged in uploadVincent Petry2013-10-171-2/+7
| | | | | | | | Fixes #5370
* | Merge pull request #4935 from owncloud/webdav-depth-fix-masterFrank Karlitschek2013-10-171-1/+1
|\ \ | |/ |/| WebDAV depth infinity support - the dirty way
| * Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ↵Thomas Müller2013-09-301-1/+1
| | | | | | | | | | | | | | | | handling of depth infinity The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released. This will and has to follow!
* | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-161-1/+5
|\ \ | | | | | | Fixed conflict dialog in IE8
| * | Fixed conflict dialog in IE8Vincent Petry2013-10-101-1/+5
| | | | | | | | | | | | | | | - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run
* | | Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \ \ | | | | | | | | Fixed drag and drop to subfolder and breadcrumb
| * | | Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| | | |
| * | | Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
| | | | | | | | | | | | | | | | Fixes #5351
* | | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
|\ \ \ \ | | | | | | | | | | try to fix unencrypted file size if it doesn't look plausible
| * | | | revert last changesBjoern Schiessle2013-10-161-3/+1
| | | | |
| * | | | added another test, if unencrypted size and encrypted size are equal we can ↵Bjoern Schiessle2013-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | also assume that something is wrong
| * | | | fix array keyBjoern Schiessle2013-10-141-1/+1
| | | | |
| * | | | try to fix unencrypted file size if it doesn't look plausibleBjoern Schiessle2013-10-141-2/+19
| | | | |
* | | | | Merge pull request #5354 from owncloud/enc_testsMorris Jobke2013-10-161-216/+106
|\ \ \ \ \ | | | | | | | | | | | | added simple test for getFileSize proxy
| * | | | | fix commentBjoern Schiessle2013-10-151-1/+1
| | | | | |
| * | | | | added simple test for getFileSize proxyBjoern Schiessle2013-10-151-216/+106
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1622-1/+61
| | | | |
* | | | | Merge pull request #5334 from owncloud/files-sharing-actionsafteruploadMorris Jobke2013-10-153-23/+29
|\ \ \ \ \ | |/ / / / |/| | | | Files sharing actions + navigation fixes
| * | | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ajax loading is not supported yet for public files view. This fix disabled the history API, ajax loading and ajax directory switch in public mode until it is implemented properly.
| * | | | Fixed file permissions after public uploadVincent Petry2013-10-141-2/+2
| |/ / / | | | | | | | | | | | | Fixes #5328
* | | | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_filesMorris Jobke2013-10-151-1/+2
|\ \ \ \ | | | | | | | | | | check if we are writing to user/files, otherwise skip encryption
| * | | | check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
| |/ / /
* | | | Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\ \ \ \ | | | | | | | | | | ocs share api: add "received_from" and "received_from_displayname" field
| * | | | fix api testsBjoern Schiessle2013-10-111-1/+2
| | | | |
| * | | | add "received_from" and "received_from_displayname" field in case of a ↵Bjoern Schiessle2013-10-101-7/+18
| | |/ / | |/| | | | | | | | | | reshared file to the output
* | | | Merge pull request #5330 from owncloud/files-removedfileactionsbkgVincent Petry2013-10-141-8/+0
|\ \ \ \ | | | | | | | | | | Removed extra bkg color on file actions when row is selected/hovered on
| * | | | Removed extra bkg color on file actions when row is selected/hovered onVincent Petry2013-10-141-8/+0
| | |/ / | |/| |
* / | | Added missing "grid" class on external storage's tableVincent Petry2013-10-141-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1319-11/+56
| | |
* | | Merge pull request #5253 from owncloud/externalstorage-adminstatusindicatorMorris Jobke2013-10-132-26/+29
|\ \ \ | | | | | | | | Fixed external storage status indicator in admin page
| * | | Now using smaller spinner image for status indicatorVincent Petry2013-10-112-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | To make the status indicator appear smaller, even in IE8 that doesn't support background-size, there is no a smaller animated gif "loading-small" for that purpose.
| * | | Fixed external storage status indicator in admin pageVincent Petry2013-10-102-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes #5241 - Fixed indicator to appear, its selector was wrong - Added spinner while saving an entry's settings - Removed ajax "async: false" that blocked the browser while saving
* | | | Merge pull request #5301 from owncloud/versioning_preview_sharedThomas Müller2013-10-122-4/+11
|\ \ \ \ | | | | | | | | | | versioning preview also for shared files
| * | | | remove debug outputBjoern Schiessle2013-10-111-1/+1
| | | | |
| * | | | Merge branch 'master' into versioning_preview_sharedBjoern Schiessle2013-10-11185-550/+245
| |\ \ \ \
| * | | | | make previews work for shared files in the versions drop-downBjoern Schiessle2013-10-102-5/+12
| | | | | |
* | | | | | Merge pull request #5304 from owncloud/files-deleteiconpositionfixMorris Jobke2013-10-111-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed position of "delete" icon in files app
| * | | | | | Fixed position of "delete" icon in files appVincent Petry2013-10-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue where only Chrome allows setting position: relative on a td element. This fix now works in IE8, Firefox and Chrome. Fixes #5056
* | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-112-24/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [OC6] file upload exception handling
| * | | | | | catch exceptions while uploading and pass on the error messageThomas Müller2013-10-082-24/+29
| | | | | | |
* | | | | | | Merge pull request #5302 from owncloud/files-missingfileactionsafteraddVincent Petry2013-10-111-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | File actions are now updated after create/upload file
| * | | | | | | File actions are now updated after create/upload fileVincent Petry2013-10-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file actions must explicitly be updated by calling FileActions.display() on the file element after creating or uploading a file. Fixes #4971 and #4993
* | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckboxVincent Petry2013-10-113-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fixed delete icon alignment in IE8
| * | | | | | | Moved IE8 inline styles in files.cssVincent Petry2013-10-113-2/+3
| | | | | | | |
| * | | | | | | Fixed delete icon alignment in IE8Vincent Petry2013-10-112-2/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Removed old inline CSS that forced every td to have position:static in the files app. (#5056)
* | | | | | | Merge pull request #5261 from owncloud/versioning_no_globBjörn Schießle2013-10-111-82/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | versioning: don't use glob() and getLocalFile()