summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\
| * always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-062-0/+2
* | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-062-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-044-6/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-032-4/+4
* Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-021-0/+3
|\
| * encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-021-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-012-0/+2
* | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-312-2/+3
|\ \
| * | get correct user for paths to the trash bin, needed for remote shares if the ...Bjoern Schiessle2015-01-302-2/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-01-316-8/+14
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-302-0/+16
* Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-292-57/+118
|\
| * Fix intendationJoas Schilling2015-01-291-3/+3
| * Fix more assertionsJoas Schilling2015-01-291-26/+26
| * Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| * make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-292-32/+93
* | Merge pull request #13746 from owncloud/no-groups-provisioning-apiThomas Müller2015-01-291-1/+1
|\ \
| * | disallow provisioning api to be enabled for groups onlyThomas Müller2015-01-291-1/+1
| |/
* | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-stepThomas Müller2015-01-293-21/+115
|\ \ | |/ |/|
| * user fs must be setup up, so that the real user folder is mounted on the user...Arthur Schiwon2015-01-221-0/+1
| * adding console command to migrate encryption keys - refs #13450Thomas Müller2015-01-223-21/+114
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-286-0/+24
* | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-271-0/+2
|\ \
| * | Call final unlink in trash wrapper's storageVincent Petry2015-01-231-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-272-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-252-0/+2
* | | [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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 17:44:12 +0000