summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-091-1/+21
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-072-10/+18
* Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\
| * Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
* | set unencrypted_size to 0 after decryption... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
|/
* fix typoBjoern Schiessle2013-12-061-1/+1
* only create new key on password change if a recovery key exists or if the use...Bjoern Schiessle2013-12-061-23/+28
* show change password form if key couldn't be decryptedBjoern Schiessle2013-12-061-1/+1
* add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-042-0/+2
* Revert "Adjust files_encryption requirements to the new core requirement (PHP...Morris Jobke2013-12-041-1/+8
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-0216-3/+24
* Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).Andreas Fischer2013-11-291-8/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-291-1/+1
* loginname is not necessarily usernameArthur Schiwon2013-11-281-4/+5
* Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\
| * fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
* | improve encryption messageMorris Jobke2013-11-271-1/+1
* | some small js fixesBjoern Schiessle2013-11-271-2/+2
* | add spinner to the template so that it can be loaded in timeBjoern Schiessle2013-11-271-1/+1
* | switch to large spinnerBjoern Schiessle2013-11-271-2/+2
* | switch from "name" attribute to "id"Bjoern Schiessle2013-11-271-2/+2
* | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-277-101/+130
|\|
| * 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
| | | |/ /
| * | | | 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 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
* | | | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-272-25/+21
* | | | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-262-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-0/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-0/+1
| | |_|/ | |/| |
* | | | added a small version of the dark loading gif, looks nicer on the blue backgr...Bjoern Schiessle2013-11-261-1/+1
* | | | use POST instead of GETBjoern Schiessle2013-11-262-3/+3
* | | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 12:31:38 +0000