summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into encryption_work_with_public_galleryThomas Mueller2013-11-243-19/+48
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-11-241-1/+10
| * [tx-robot] updated from transifexJenkins for ownCloud2013-11-213-18/+38
* | fix getFileKey() callBjoern Schiessle2013-11-211-1/+1
* | 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
| |/
* | better distinction between userID and keyIdBjoern Schiessle2013-11-212-28/+32
* | 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
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0328-28/+6
* | Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmis...Vincent Petry2013-10-301-1/+12
|\ \
| * | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | | remove unused variableBjoern Schiessle2013-10-301-2/+0
* | | if the database doesn't contain any information about the recovery mode than ...Bjoern Schiessle2013-10-301-1/+1
* | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-301-1/+2
|\ \ \
| * | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-291-1/+2
* | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-291-14/+48
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-292-1/+21
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-277-4/+47
|/ /
* | files_encryption: Fix getFileSize()Markus Goetz2013-10-232-3/+38
* | remove debug outputBjoern Schiessle2013-10-221-1/+0
* | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-223-1/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-211-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-192-0/+9
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 08:20:18 +0000