summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-244-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2316-2/+50
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-22112-232/+120
* Merge pull request #13517 from owncloud/keymanager-storageMorris Jobke2015-01-221-12/+9
|\
| * Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
* | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-212-24/+24
|/
* Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro...Morris Jobke2015-01-191-2/+11
|\
| * Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-2/+11
* | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
* | Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\ \
| * | Add class attribute types in encryption Util classVincent Petry2015-01-191-0/+51
| * | Skip stray part files during initial encryptionVincent Petry2015-01-191-0/+4
* | | replace hook with storage wrapperBjoern Schiessle2015-01-191-21/+19
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-01-182-8/+8
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-172-8/+38
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-162-2/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-152-4/+6
* Remove unneeded addTranslations() callsVincent Petry2015-01-141-1/+0
* Merge pull request #13288 from owncloud/enc_fix_public_downloadLukas Reschke2015-01-143-25/+14
|\
| * if we download a public shared file we need to retrieve the user from the pathBjoern Schiessle2015-01-133-25/+14
* | Merge pull request #13311 from owncloud/fix_restore_keysBjörn Schießle2015-01-142-21/+135
|\ \
| * | adapt decrypt all and restore/delete key backups to the new folder structure ...Bjoern Schiessle2015-01-132-21/+135
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-142-0/+12
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-132-6/+6
* | Check array size, before using the 3rd element from itJoas Schilling2015-01-121-0/+9
|/
* Merge pull request #13182 from owncloud/download_versionsBjörn Schießle2015-01-129-143/+393
|\
| * make versions of shared files downloadableBjoern Schiessle2015-01-099-143/+393
* | unit testsBjoern Schiessle2015-01-091-4/+86
* | don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-092-50/+50
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-0510-24/+70
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-042-12/+12
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-024-28/+32
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-012-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-312-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-272-4/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-262-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-232-2/+4
* Merge pull request #12961 from owncloud/try_to_cache_keysMorris Jobke2014-12-224-19/+91
|\
| * cache keys to read them only once from the hard discBjoern Schiessle2014-12-194-19/+91
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-222-0/+12
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-212-4/+6
* | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-193-21/+99
* | Merge pull request #12896 from owncloud/drop-deprecatedJörn Friedrich Dreyer2014-12-182-9/+14
|\ \ | |/ |/|
| * first step to drop \OCP\Config:: in favour of IConfigMorris Jobke2014-12-172-9/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-172-6/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-104-8/+12
* Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0938-701/+678
|\
| * Correctly namespace encryption testsJoas Schilling2014-12-0912-185/+181