summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #7792 from owncloud/extstorage-fixpersonalstorageVincent Petry2014-03-192-17/+136
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| * | | | | | | | | Fix validation of allowed personal backendVincent Petry2014-03-181-1/+1
| |/ / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-199-0/+23
* | | | | | | | | Merge pull request #7766 from Xenopathic/masterRobin McCorkell2014-03-181-11/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 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 APIBjoern Schiessle2014-03-132-5/+128
* | | | | | | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | [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_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 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 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add 'received_from' info to the share, so that every share can have a differe...Bjoern Schiessle2014-03-111-2/+4
| * | | | | 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 successfullyBjoern Schiessle2014-03-102-7/+40
* | | | | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-107-150/+78
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 fileVincent Petry2014-03-071-1/+1
* | | | | | Merge pull request #7631 from ichEben/masterVincent Petry2014-03-101-1/+1
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Return unencrypted_size of folder when queriedVincent Petry2014-03-072-0/+27
| | |/ / / | |/| | |
* | | | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-99/+94
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 knownVincent Petry2014-03-061-1/+3
| * | | | | Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
* | | | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0617-63/+184
|\| | | | |
| * | | | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
| |\ \ \ \ \