summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7766 from Xenopathic/masterRobin McCorkell2014-03-181-11/+5
|\ | | | | Fix smb4php to work with home shares
| * Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
| | | | | | Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
* | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-171-1/+1
|\ \ | |/ |/| Move routing classes to an interface and expose it in the public api
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-101-1/+1
| |
* | clearify the use-case of this appFrank Karlitschek2014-03-171-1/+1
| |
* | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-163-6/+6
|\ \ | | | | | | remove unneeded icon class
| * | remove unneeded icon classJan-Christoph Borchardt2014-03-143-6/+6
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-164-0/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1510-1/+25
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1318-0/+359
| |
* | Merge pull request #7686 from owncloud/ocs_fix_pathsBjörn Schießle2014-03-132-5/+128
|\ \ | | | | | | finally fix the paths for the OCS Share API
| * | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-132-5/+128
| | |
* | | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
|\ \ \ | |/ / |/| | Update index.php
| * | Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
| | | | | | | | | On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
* | | [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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 23:53:47 +0000