| Commit message (Expand) | Author | Age | Files | Lines |
* | [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: | 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 |
|\ \ |
|
| * | | get correct user for paths to the trash bin, needed for remote shares if the ... | Bjoern Schiessle | 2015-01-30 | 2 | -2/+3 |
| |/ |
|
* / | [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 |
|\ |
|
| * | 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 | 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 |
|\ \
| |/
|/| |
|
| * | user fs must be setup up, so that the real user folder is mounted on the user... | Arthur Schiwon | 2015-01-22 | 1 | -0/+1 |
| * | 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 | Vincent Petry | 2015-01-23 | 1 | -0/+2 |
* | | | [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 | Robin Appelman | 2015-01-20 | 1 | -12/+9 |
* | | | Make naming of encryption app consistent | Lukas Reschke | 2015-01-21 | 2 | -2/+10 |
| |/
|/| |
|
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-21 | 2 | -24/+24 |
|/ |
|
* | Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro... | Morris Jobke | 2015-01-19 | 1 | -2/+11 |
|\ |
|
| * | Prioritise Basic Auth header over Cookie | Lukas Reschke | 2015-01-17 | 1 | -2/+11 |
* | | fix typo of blog -> changed to block | Morris Jobke | 2015-01-19 | 2 | -2/+2 |
* | | Merge pull request #13457 from owncloud/enc-skippartfiles | Thomas Müller | 2015-01-19 | 1 | -0/+55 |
|\ \ |
|
| * | | 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 |
|\ |
|
| * | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 3 | -25/+14 |
* | | Merge pull request #13311 from owncloud/fix_restore_keys | Björn Schießle | 2015-01-14 | 2 | -21/+135 |
|\ \ |
|
| * | | adapt decrypt all and restore/delete key backups to the new folder structure ... | Bjoern Schiessle | 2015-01-13 | 2 | -21/+135 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-14 | 2 | -0/+12 |
|/ / |
|
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-13 | 2 | -6/+6 |
* | | Check array size, before using the 3rd element from it | Joas Schilling | 2015-01-12 | 1 | -0/+9 |
|/ |
|