Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #15906 from rullzer/fix_15777 | Morris Jobke | 2015-04-29 | 1 | -0/+46 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Added unit test | Roeland Jago Douma | 2015-04-28 | 1 | -0/+46 | |
* | | | | Filter potential dangerous filenames for avatars | Lukas Reschke | 2015-04-28 | 1 | -0/+23 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 2 | -2/+3 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fix test | Robin Appelman | 2015-04-27 | 1 | -1/+0 | |
| * | | dont use our now non existing hook | Robin Appelman | 2015-04-27 | 1 | -1/+3 | |
* | | | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 1 | -0/+3 | |
|\ \ \ | ||||||
| * | | | fixes #15848 | Thomas Müller | 2015-04-27 | 1 | -0/+3 | |
| |/ / | ||||||
* | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 1 | -1/+1 | |
* | | | Fix new tests | Joas Schilling | 2015-04-27 | 2 | -5/+2 | |
* | | | Add unit tests for the commands | Joas Schilling | 2015-04-27 | 3 | -0/+274 | |
* | | | Make getDefaultModuleId public and get module protected | Joas Schilling | 2015-04-27 | 1 | -4/+6 | |
* | | | Deduplicate module mock | Joas Schilling | 2015-04-27 | 1 | -41/+34 | |
* | | | Add test for setDefaultEncryptionModule | Joas Schilling | 2015-04-27 | 1 | -0/+31 | |
* | | | Add a test that the default module is returned before we fall back | Joas Schilling | 2015-04-27 | 1 | -1/+35 | |
|/ / | ||||||
* | | Merge pull request #15834 from owncloud/make-temporary-file-really-unique | Lukas Reschke | 2015-04-25 | 1 | -4/+25 | |
|\ \ | ||||||
| * | | Fix collision on temporary files + adjust permissions | Lukas Reschke | 2015-04-23 | 1 | -4/+25 | |
* | | | Merge pull request #15683 from owncloud/block-legacy-clients | Lukas Reschke | 2015-04-24 | 1 | -0/+129 | |
|\ \ \ | ||||||
| * | | | Catch not existing User-Agent header | Lukas Reschke | 2015-04-23 | 1 | -1/+12 | |
| * | | | Use 403 instead a 50x response | Lukas Reschke | 2015-04-20 | 1 | -1/+2 | |
| * | | | Block old legacy clients | Lukas Reschke | 2015-04-20 | 1 | -0/+117 | |
* | | | | fix unit tests | Bjoern Schiessle | 2015-04-24 | 1 | -5/+16 | |
* | | | | enable testWriteWriteRead | jknockaert | 2015-04-24 | 1 | -14/+14 | |
* | | | | enable testRewind | jknockaert | 2015-04-24 | 1 | -14/+14 | |
* | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -14/+14 | |
* | | | | disable r+ test | jknockaert | 2015-04-24 | 1 | -14/+14 | |
* | | | | add two tests | jknockaert | 2015-04-24 | 1 | -0/+30 | |
* | | | | Merge pull request #15839 from owncloud/enc_fix_moving_shared_files | Joas Schilling | 2015-04-24 | 3 | -23/+272 | |
|\ \ \ \ | ||||||
| * | | | | Add test "operation on keys failed" | Joas Schilling | 2015-04-24 | 1 | -7/+10 | |
| * | | | | Deduplicate data provider and fix method visibility | Joas Schilling | 2015-04-24 | 2 | -19/+15 | |
| * | | | | only update share keys if the file was encrypted | Bjoern Schiessle | 2015-04-24 | 1 | -2/+4 | |
| * | | | | update share keys if file gets copied | Bjoern Schiessle | 2015-04-23 | 1 | -16/+67 | |
| * | | | | update share keys if a file is moved to a shared folder | Bjoern Schiessle | 2015-04-23 | 3 | -6/+203 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exception | blizzz | 2015-04-23 | 2 | -0/+211 | |
|\ \ \ \ | ||||||
| * | | | | Fix file names | Joas Schilling | 2015-04-23 | 2 | -0/+0 | |
| * | | | | Add tests for occ user:lastseen | Joas Schilling | 2015-04-23 | 1 | -0/+105 | |
| * | | | | Add unit tests for occ user:delete | Joas Schilling | 2015-04-23 | 1 | -0/+106 | |
| |/ / / | ||||||
* / / / | Delete temp files after testing encryption stream wrapper | Vincent Petry | 2015-04-23 | 1 | -0/+6 | |
|/ / / | ||||||
* | | | Merge pull request #15809 from owncloud/view-null-root | Vincent Petry | 2015-04-22 | 1 | -2/+19 | |
|\ \ \ | ||||||
| * | | | add unit tests for null handling in view | Robin Appelman | 2015-04-22 | 1 | -2/+19 | |
| | |/ | |/| | ||||||
* | | | pass KeyStorage via ctor | Thomas Müller | 2015-04-22 | 1 | -26/+1 | |
* | | | calling renameKeys() on directory level as well - fixes #15778 | Thomas Müller | 2015-04-22 | 1 | -2/+15 | |
* | | | add $encryptionModuleId to methods of Keys/IStorage | Thomas Müller | 2015-04-22 | 2 | -15/+14 | |
|/ / | ||||||
* | | Merge pull request #15757 from owncloud/enc-fixfeofforlastblock | Björn Schießle | 2015-04-22 | 3 | -6/+90 | |
|\ \ | ||||||
| * | | Fix encryption feof to not return too early | Vincent Petry | 2015-04-20 | 3 | -6/+90 | |
* | | | get dirname from sharePath | Bjoern Schiessle | 2015-04-21 | 1 | -1/+95 | |
* | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound | Lukas Reschke | 2015-04-20 | 1 | -8/+20 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add tests for correct path | Joas Schilling | 2015-04-20 | 1 | -1/+2 | |
| * | | Fix phpStorm complains and namespace | Joas Schilling | 2015-04-20 | 1 | -7/+18 | |
| |/ |