Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-07 | 2 | -0/+4 |
| | |||||
* | Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval | Thomas Müller | 2015-02-06 | 2 | -7/+18 |
|\ | | | | | Fix enc mig user retrieval | ||||
| * | always specify limit, except you do like questionable surprises | Arthur Schiwon | 2015-02-06 | 2 | -7/+18 |
| | | | | | | | | always specify limit, except you do like questionable surprises, part 2 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 2 | -0/+2 |
| | | |||||
* | | don't check if we have a valid user | Bjoern Schiessle | 2015-02-06 | 1 | -5/+1 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-06 | 2 | -0/+10 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-04 | 4 | -6/+10 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-03 | 2 | -4/+4 |
| | |||||
* | Merge pull request #13817 from owncloud/core-apps-dependencies | Morris Jobke | 2015-02-02 | 1 | -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üller | 2015-02-02 | 1 | -0/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-01 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares | Lukas Reschke | 2015-01-31 | 2 | -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 Schiessle | 2015-01-30 | 2 | -2/+3 |
| |/ | | | | | | | size of of trash gets calculated | ||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 6 | -8/+14 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 2 | -0/+16 |
| | |||||
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 2 | -57/+118 |
|\ | | | | | make sure that we always create a public share key for remote shares | ||||
| * | Fix intendation | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | |||||
| * | Fix more assertions | Joas Schilling | 2015-01-29 | 1 | -26/+26 |
| | | |||||
| * | Fix 2 assertions | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | |||||
| * | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 2 | -32/+93 |
| | | |||||
* | | Merge pull request #13746 from owncloud/no-groups-provisioning-api | Thomas Müller | 2015-01-29 | 1 | -1/+1 |
|\ \ | | | | | | | disallow provisioning api to be enabled for groups only | ||||
| * | | disallow provisioning api to be enabled for groups only | Thomas Müller | 2015-01-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step | Thomas Müller | 2015-01-29 | 3 | -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 Schiwon | 2015-01-22 | 1 | -0/+1 |
| | | | | | | | | username based path | ||||
| * | adding console command to migrate encryption keys - refs #13450 | Thomas Müller | 2015-01-22 | 3 | -21/+114 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-28 | 6 | -0/+24 |
| | | |||||
* | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 1 | -0/+2 |
|\ \ | | | | | | | Call final unlink in trash wrapper's storage | ||||
| * | | Call final unlink in trash wrapper's storage | Vincent Petry | 2015-01-23 | 1 | -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 transifex | Jenkins for ownCloud | 2015-01-27 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-25 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-24 | 4 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-23 | 16 | -2/+50 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-22 | 112 | -232/+120 |
| | | |||||
* | | Merge pull request #13517 from owncloud/keymanager-storage | Morris Jobke | 2015-01-22 | 1 | -12/+9 |
|\ \ | | | | | | | Bypass the view when storing encryption keys | ||||
| * | | Bypass the view when storing encryption keys | Robin Appelman | 2015-01-20 | 1 | -12/+9 |
| | | | |||||
* | | | Make naming of encryption app consistent | Lukas Reschke | 2015-01-21 | 2 | -2/+10 |
| |/ |/| | | | | | Fixes https://github.com/owncloud/core/issues/13580 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-21 | 2 | -24/+24 |
|/ | |||||
* | Merge pull request #13416 from ↵ | Morris Jobke | 2015-01-19 | 1 | -2/+11 |
|\ | | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie | ||||
| * | Prioritise Basic Auth header over Cookie | Lukas Reschke | 2015-01-17 | 1 | -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 block | Morris Jobke | 2015-01-19 | 2 | -2/+2 |
| | | | | | | | | * fixes #13460 | ||||
* | | Merge pull request #13457 from owncloud/enc-skippartfiles | Thomas Müller | 2015-01-19 | 1 | -0/+55 |
|\ \ | | | | | | | Skip stray part files during initial encryption | ||||
| * | | Add class attribute types in encryption Util class | Vincent Petry | 2015-01-19 | 1 | -0/+51 |
| | | | |||||
| * | | Skip stray part files during initial encryption | Vincent Petry | 2015-01-19 | 1 | -0/+4 |
| | | | |||||
* | | | replace hook with storage wrapper | Bjoern Schiessle | 2015-01-19 | 1 | -21/+19 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-18 | 2 | -8/+8 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-17 | 2 | -8/+38 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-16 | 2 | -2/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-15 | 2 | -4/+6 |
| | |||||
* | Remove unneeded addTranslations() calls | Vincent Petry | 2015-01-14 | 1 | -1/+0 |
| | |||||
* | Merge pull request #13288 from owncloud/enc_fix_public_download | Lukas Reschke | 2015-01-14 | 3 | -25/+14 |
|\ | | | | | [encryption] fix download of public shared files |