aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-072-0/+4
|
* Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\ | | | | Fix enc mig user retrieval
| * always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
| | | | | | | | always specify limit, except you do like questionable surprises, part 2
* | [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:
| * 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
|\ \ | | | | | | make sure that we get the correct user from the path
| * | get correct user for paths to the trash bin, needed for remote shares if the ↵Bjoern Schiessle2015-01-302-2/+3
| |/ | | | | | | size of of trash gets calculated
* / [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
|\ | | | | make sure that we always create a public share key for remote shares
| * 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 only
| * | 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
|\ \ | |/ |/| adding console command to migrate encryption keys - refs #13450
| * user fs must be setup up, so that the real user folder is mounted on the ↵Arthur Schiwon2015-01-221-0/+1
| | | | | | | | username based path
| * 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 storage
| * | Call final unlink in trash wrapper's storageVincent Petry2015-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past))
* | | [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 keys
| * | Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
| | |
* | | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
| |/ |/| | | | | Fixes https://github.com/owncloud/core/issues/13580
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-212-24/+24
|/
* Merge pull request #13416 from ↵Morris Jobke2015-01-191-2/+11
|\ | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie
| * Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header. This patch adds a workaround the following way: 1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF) 2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well. This requires proper testing also considering LDAP / Shibboleth and whatever instances.
* | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
| | | | | | | | * fixes #13460
* | Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\ \ | | | | | | Skip stray part files during initial encryption
| * | 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
|\ | | | | [encryption] fix download of public shared files