summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\
| * Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
* | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-174-7/+25
|/
* Merge pull request #5378 from owncloud/files-permissionsafteruploadfixMorris Jobke2013-10-171-2/+7
|\
| * Fixed upload permissions distinction between public and logged in uploadVincent Petry2013-10-171-2/+7
* | Merge pull request #4935 from owncloud/webdav-depth-fix-masterFrank Karlitschek2013-10-171-1/+1
|\ \ | |/ |/|
| * Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ...Thomas Müller2013-09-301-1/+1
* | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-161-1/+5
|\ \
| * | Fixed conflict dialog in IE8Vincent Petry2013-10-101-1/+5
* | | Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \ \
| * | | Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| * | | Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
* | | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
|\ \ \ \
| * | | | revert last changesBjoern Schiessle2013-10-161-3/+1
| * | | | added another test, if unencrypted size and encrypted size are equal we can a...Bjoern Schiessle2013-10-151-1/+3
| * | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
| * | | | Fixed file permissions after public uploadVincent Petry2013-10-141-2/+2
| |/ / /
* | | | 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 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
|\ \ \ \
| * | | | fix api testsBjoern Schiessle2013-10-111-1/+2
| * | | | add "received_from" and "received_from_displayname" field in case of a reshar...Bjoern Schiessle2013-10-101-7/+18
| | |/ / | |/| |
* | | | 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 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
|\ \ \
| * | | Now using smaller spinner image for status indicatorVincent Petry2013-10-112-6/+3
| * | | Fixed external storage status indicator in admin pageVincent Petry2013-10-102-26/+32
* | | | Merge pull request #5301 from owncloud/versioning_preview_sharedThomas Müller2013-10-122-4/+11
|\ \ \ \
| * | | | 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 appVincent Petry2013-10-111-3/+1
* | | | | | | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-112-24/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 fileVincent Petry2013-10-111-2/+5
* | | | | | | | Merge pull request #5274 from owncloud/files-ie8-deletecheckboxVincent Petry2013-10-113-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Moved IE8 inline styles in files.cssVincent Petry2013-10-113-2/+3
| * | | | | | | Fixed delete icon alignment in IE8Vincent Petry2013-10-112-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #5261 from owncloud/versioning_no_globBjörn Schießle2013-10-111-82/+58
|\ \ \ \ \ \ \