summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
* Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-2712-44/+71
|\
| * Merge pull request #5976 from owncloud/encryption_work_with_public_galleryThomas Müller2013-11-277-93/+123
| |\
| | * typo fixedBjoern Schiessle2013-11-271-1/+1
| | * some small changes according to the review commentsBjoern Schiessle2013-11-277-18/+19
| | * Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/cor...Bjoern Schiessle2013-11-253-19/+48
| | |\
| | | * Merge branch 'master' into encryption_work_with_public_galleryThomas Mueller2013-11-243-19/+48
| | | |\
| | * | | fix typo in commentBjoern Schiessle2013-11-251-1/+1
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-0/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-0/+1
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-11-241-1/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-11-213-18/+38
* | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-4/+10
|\ \ \
| * | | check HTTP Referer to check if we come from public.php or from a internal page.Bjoern Schiessle2013-11-211-4/+10
| | |/ | |/|
* | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-1/+1
|\| |
| * | fix getFileKey() callBjoern Schiessle2013-11-211-1/+1
* | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-214-13/+15
|\| |
| * | Merge branch 'master' into encryption_work_with_public_galleryBjoern Schiessle2013-11-214-13/+15
| |\|
| | * Merge pull request #5967 from owncloud/encryption-extstorage-fixsizeresetVincent Petry2013-11-202-1/+5
| | |\
| | | * Fix for extstorage + encryption where unencrypted size is not keptVincent Petry2013-11-202-1/+5
| | * | check if it is a cached file or a version to resolve the correct path to the ...Bjoern Schiessle2013-11-201-1/+5
| | * | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-204-25/+17
| | |/
* | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-212-29/+34
|\| |
| * | better distinction between userID and keyIdBjoern Schiessle2013-11-212-28/+32
* | | public upload now also works with encryption enabledBjoern Schiessle2013-11-215-23/+20
|/ /
* | adapt tests to the new codeBjoern Schiessle2013-11-201-9/+13
* | make sure that we always use the correct user idBjoern Schiessle2013-11-203-11/+21
* | fix some getShareKey() and getFileKey() callsBjoern Schiessle2013-11-201-3/+3
* | [wip] make encryption work with public gallery sharingBjoern Schiessle2013-11-205-56/+65
|/
* make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
* Merge pull request #5908 from owncloud/fix_errorpage_callVincent Petry2013-11-181-1/+1
|\
| * call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-152-0/+2
* | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \
| * | remove debug outputBjoern Schiessle2013-11-141-6/+0
| * | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ...Bjoern Schiessle2013-11-141-0/+64
| * | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-136-72/+107
| |\|
| * | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| * | only update file cache if the file is already indexed to avoid that we create...Bjoern Schiessle2013-11-121-11/+14
| * | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
* | | tests addedBjoern Schiessle2013-11-151-1/+14
* | | instead of writing etmp files we write the dummy file to data/user/cache to a...Bjoern Schiessle2013-11-143-15/+50
| |/ |/|
* | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-136-72/+107
|\ \ | |/ |/|
| * rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-124-12/+12
| * missed some replacements... now tests should workBjoern Schiessle2013-11-121-13/+6
| * fixing tests for the new part file handlingBjoern Schiessle2013-11-125-42/+86
| * let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-091-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0611-0/+37
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-033-0/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-07 06:52:02 +0000