| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15886 from owncloud/fix-15848-master | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
|\ |
|
| * | fixes #15848 | Thomas Müller | 2015-04-27 | 1 | -1/+4 |
* | | Merge pull request #15860 from owncloud/enc_fallback_old_encryption | Thomas Müller | 2015-04-27 | 2 | -14/+36 |
|\ \
| |/
|/| |
|
| * | fall back to the ownCloud default encryption module and aes128 if we read a e... | Bjoern Schiessle | 2015-04-27 | 2 | -14/+36 |
* | | Merge pull request #15882 from owncloud/fix-type-annotation | Morris Jobke | 2015-04-27 | 1 | -1/+1 |
|\ \ |
|
| * | | Fix type annotation | Lukas Reschke | 2015-04-27 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #15411 from mmattel/fix_for_15375_better_message_text | Thomas Müller | 2015-04-27 | 1 | -0/+1 |
|\ \ |
|
| * | | Improve error messge text for app upgrade try (#15375) | Martin | 2015-04-22 | 1 | -0/+1 |
* | | | Make getDefaultModuleId public and get module protected | Joas Schilling | 2015-04-27 | 3 | -14/+8 |
* | | | Verify that the encryption module exists before setting it | Joas Schilling | 2015-04-27 | 1 | -6/+7 |
| |/
|/| |
|
* | | Merge pull request #15834 from owncloud/make-temporary-file-really-unique | Lukas Reschke | 2015-04-25 | 1 | -38/+61 |
|\ \ |
|
| * | | Fix collision on temporary files + adjust permissions | Lukas Reschke | 2015-04-23 | 1 | -38/+61 |
* | | | Merge pull request #15683 from owncloud/block-legacy-clients | Lukas Reschke | 2015-04-24 | 1 | -0/+79 |
|\ \ \ |
|
| * | | | Catch not existing User-Agent header | Lukas Reschke | 2015-04-23 | 1 | -1/+5 |
| * | | | Use 403 instead a 50x response | Lukas Reschke | 2015-04-20 | 1 | -10/+9 |
| * | | | Block old legacy clients | Lukas Reschke | 2015-04-20 | 1 | -0/+76 |
* | | | | fix unit tests | Bjoern Schiessle | 2015-04-24 | 1 | -4/+10 |
* | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -1/+2 |
* | | | | fixed name | jknockaert | 2015-04-24 | 1 | -1/+1 |
* | | | | Update encryption.php | jknockaert | 2015-04-24 | 1 | -8/+8 |
* | | | | fix encryption header error | jknockaert | 2015-04-24 | 1 | -13/+16 |
* | | | | Merge pull request #15839 from owncloud/enc_fix_moving_shared_files | Joas Schilling | 2015-04-24 | 6 | -52/+125 |
|\ \ \ \ |
|
| * | | | | Use public interfaces for type hinting | Joas Schilling | 2015-04-24 | 1 | -12/+12 |
| * | | | | only update share keys if the file was encrypted | Bjoern Schiessle | 2015-04-24 | 2 | -4/+19 |
| * | | | | update share keys if file gets copied | Bjoern Schiessle | 2015-04-23 | 1 | -3/+3 |
| * | | | | update share keys if a file is moved to a shared folder | Bjoern Schiessle | 2015-04-23 | 5 | -40/+98 |
| | |/ /
| |/| | |
|
* / | | | Ignore test folders when checking the code for compliance | Thomas Müller | 2015-04-23 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #15809 from owncloud/view-null-root | Vincent Petry | 2015-04-22 | 1 | -0/+6 |
|\ \ \ |
|
| * | | | typo | Robin Appelman | 2015-04-22 | 1 | -1/+1 |
| * | | | dont allow using null as view root | Robin Appelman | 2015-04-22 | 1 | -0/+6 |
* | | | | Merge pull request #15799 from owncloud/fix-enc-folder-move | Thomas Müller | 2015-04-22 | 5 | -180/+71 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | fix PHPDoc | Thomas Müller | 2015-04-22 | 1 | -7/+8 |
| * | | | pass KeyStorage via ctor | Thomas Müller | 2015-04-22 | 2 | -17/+11 |
| * | | | calling renameKeys() on directory level as well - fixes #15778 | Thomas Müller | 2015-04-22 | 1 | -7/+3 |
| * | | | add $encryptionModuleId to methods of Keys/IStorage | Thomas Müller | 2015-04-22 | 4 | -156/+56 |
* | | | | Merge pull request #15787 from owncloud/trash-partfiles | Morris Jobke | 2015-04-22 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Do not trash part files, delete directly | Vincent Petry | 2015-04-21 | 1 | -2/+2 |
* | | | | | Merge pull request #15549 from owncloud/jcf-fix-cache-update | Morris Jobke | 2015-04-22 | 1 | -1/+8 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | clarify the duplication of the $params array | Jens-Christian Fischer | 2015-04-12 | 1 | -1/+2 |
| * | | | | don't update identical values | Jens-Christian Fischer | 2015-04-11 | 1 | -1/+7 |
* | | | | | Merge pull request #15757 from owncloud/enc-fixfeofforlastblock | Björn Schießle | 2015-04-22 | 1 | -0/+4 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Fix encryption feof to not return too early | Vincent Petry | 2015-04-20 | 1 | -0/+4 |
| | |_|/
| |/| | |
|
* | | | | get dirname from sharePath | Bjoern Schiessle | 2015-04-21 | 1 | -1/+1 |
* | | | | Merge pull request #15636 from owncloud/enc2_performance_improvement | Björn Schießle | 2015-04-21 | 1 | -3/+2 |
|\ \ \ \ |
|
| * | | | | set size and unencrypted size to zero on fopen | Bjoern Schiessle | 2015-04-20 | 1 | -3/+2 |
* | | | | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more | Vincent Petry | 2015-04-20 | 5 | -19/+71 |
|\ \ \ \ \ |
|
| * | | | | | move permission related code into getMetaData() | Thomas Müller | 2015-04-20 | 3 | -15/+20 |
| * | | | | | Introduce Storage::getMetaData() to allow storage implementations more contro... | Thomas Müller | 2015-04-20 | 5 | -10/+10 |
| * | | | | | Introduce Storage::getData() to allow storage implementations more control ov... | Thomas Müller | 2015-04-20 | 5 | -10/+57 |
* | | | | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound | Lukas Reschke | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|