summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-139-0/+22
|
* Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-masterLukas Reschke2014-03-121-1/+0
|\ | | | | remove Sabre_DAV_Browser_Plugin
| * remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
| |
* | Merge pull request #7669 from owncloud/versions_predeleteVincent Petry2014-03-121-1/+4
|\ \ | | | | | | add preDelete hook for files_versions app
| * | add preDelete hook for files_versions appGeorg Ehrke2014-03-111-1/+4
| | |
* | | Merge pull request #7668 from owncloud/trashbin_predeleteVincent Petry2014-03-121-0/+1
|\ \ \ | | | | | | | | add preDelete hook for files_trashbin app
| * | | add preDelete hook for files_trashbin appGeorg Ehrke2014-03-111-0/+1
| |/ /
* | / [tx-robot] updated from transifexJenkins for ownCloud2014-03-12131-36/+280
| |/ |/|
* | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-112-8/+201
|\ \ | |/ |/| Fix ocs share api paths
| * add 'received_from' info to the share, so that every share can have a ↵Bjoern Schiessle2014-03-111-2/+4
| | | | | | | | different value
| * fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-6/+197
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-11293-970/+866
|/
* Merge pull request #7646 from owncloud/fix_ocs_api_unshareThomas Müller2014-03-102-7/+40
|\ | | | | we need the file_source to delete a share successfully
| * we need the file_source to delete a share successfullyBjoern Schiessle2014-03-102-7/+40
| |
* | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-107-150/+78
|\ \ | | | | | | [trash] fall back if file is not in db
| * | fix mimetype detection, introduce fake etag to identify preview imagesBjoern Schiessle2014-03-101-1/+2
| | |
| * | get trash size from file cacheBjoern Schiessle2014-03-104-77/+10
| | |
| * | only enable previews if the encryption is disabledBjoern Schiessle2014-03-101-1/+5
| | |
| * | if file is not in db, fall back to restore file to the users rootBjoern Schiessle2014-03-104-72/+62
| | |
* | | Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\ \ \ | | | | | | | | Fixed log warning when deleting a single file
| * | | Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
| | | |
* | | | Merge pull request #7631 from ichEben/masterVincent Petry2014-03-101-1/+1
|\ \ \ \ | | | | | | | | | | [6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
| * | | | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
| |/ / /
* | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-0/+27
|\ \ \ \ | |/ / / |/| | | [master] Fixed used space to be based on unencrypted size
| * | | Return unencrypted_size of folder when queriedVincent Petry2014-03-072-0/+27
| | |/ | |/| | | | | | | | | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-99/+94
|\ \ \ | |/ / |/| | Add caching for getLocalFile on remote storages
| * | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-99/+94
| | |
* | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-062-499/+633
|\ \ \ | | | | | | | | Fixed upload issue when free space is not known (ex: FTP)
| * | | Fixed upload issue when free space is not knownVincent Petry2014-03-061-1/+3
| | | |
| * | | Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
| | | | | | | | | | | | | | | | | | | | | | | | - Added OC.Upload.init() to make the code testable - Added unit tests for the add() method of the uploader with some error cases
* | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0617-63/+184
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js
| * | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
| |\ \ \ | | | | | | | | | | Do not set #dir when on public.php
| | * | | Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | Fix #7571
| * | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | Use 'command -v' to detect whether and where software is installed (instead of 'which')
| | * | | | Use 'command -v' to detect whether and where software is installed (instead ↵Philipp Schmitt2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | of 'which')
| * | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-055-26/+61
| |\ \ \ \ \ | | | | | | | | | | | | | | don't allow to create a file or folder named 'Shared' in the root folder
| | * | | | | don't allow to create a file or folder named 'Shared' in the root folder, ↵Bjoern Schiessle2014-03-055-26/+61
| | | |_|/ / | | |/| | | | | | | | | | | | | | | also exclude all combinations of lower and upper case letters
| * | | | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-051-1/+1
| | |_|/ / | |/| | |
| * | | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
| |\ \ \ \ | | | | | | | | | | | | Allow admins to disable certain external storages for users
| | * | | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
| | | | | | | | | | | | | | | | | | | | | | | | Fix issue #6793
| * | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folderVincent Petry2014-03-051-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | [enc] don't create users files folder
| | * | | | | don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
| | | | | | |
| * | | | | | Merge pull request #7012 from owncloud/display-share-owner-masterVincent Petry2014-03-054-13/+30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | adding share owner information to the file list
| | * | | | | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-2832-150/+831
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/cache.php
| | * | | | | | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see https://github.com/owncloud/core/pull/7012/files#r9337198 http://24ways.org/2011/your-jquery-now-with-less-suck/
| | * | | | | | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| | | | | | | |
| | * | | | | | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| | | | | | | |
| | * | | | | | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| | | | | | | |
| | * | | | | | update share ownerThomas Müller2014-02-201-0/+8
| | | | | | | |
| | * | | | | | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 04:30:16 +0000