Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display the module settings in the list of the encryption modules | Joas Schilling | 2015-05-04 | 3 | -7/+5 |
* | Merge pull request #15652 from oparoz/better-text-previews | Lukas Reschke | 2015-05-04 | 2 | -13/+60 |
|\ | |||||
| * | Remove overflow+watermark | Olivier Paroz | 2015-04-23 | 2 | -14/+6 |
| * | Use authorization headers for better compatibility | Olivier Paroz | 2015-04-23 | 1 | -22/+25 |
| * | An idea to suggest that this is just a sample of the full text | Olivier Paroz | 2015-04-23 | 2 | -1/+15 |
| * | Use webDAV to have access to HTTP byte ranges | Olivier Paroz | 2015-04-23 | 1 | -1/+4 |
| * | Cache the token value | Olivier Paroz | 2015-04-23 | 1 | -4/+3 |
| * | Show a text preview instead of a bitmap preview of text | Olivier Paroz | 2015-04-23 | 2 | -6/+42 |
* | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-values | Thomas Müller | 2015-05-04 | 4 | -93/+299 |
|\ \ | |||||
| * | | change error codes to 400 | Clark Tomlinson | 2015-04-24 | 2 | -20/+20 |
| * | | fix messages from settings crontroller | Clark Tomlinson | 2015-04-22 | 2 | -14/+15 |
| * | | remove status's and adjust js | Clark Tomlinson | 2015-04-22 | 3 | -67/+88 |
| * | | destupify tests | Clark Tomlinson | 2015-04-22 | 2 | -104/+100 |
| * | | fixing return values and adding tests | Clark Tomlinson | 2015-04-22 | 2 | -32/+220 |
* | | | Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder | Thomas Müller | 2015-05-04 | 4 | -3/+83 |
|\ \ \ | |||||
| * | | | Simplify the test | Joas Schilling | 2015-04-30 | 3 | -14/+8 |
| * | | | skip user if we don't have a public key | Bjoern Schiessle | 2015-04-30 | 3 | -1/+87 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-04 | 12 | -2/+50 |
* | | | | Merge pull request #15486 from owncloud/versions-rollbackkeepfileid | Morris Jobke | 2015-05-03 | 2 | -4/+121 |
|\ \ \ \ | |||||
| * | | | | Use moveFromStorage instead of streamCopy when restoring version | Vincent Petry | 2015-04-30 | 1 | -14/+1 |
| * | | | | Fix version rollback to keep fileid | Vincent Petry | 2015-04-30 | 2 | -4/+134 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-02 | 20 | -30/+36 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-01 | 14 | -4/+70 |
* | | | | Moving encryption_dummy to the apps repo - fixes #15950 | Thomas Müller | 2015-04-30 | 5 | -218/+0 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 36 | -38/+16 |
* | | | Merge pull request #15919 from owncloud/enc_handle_empty_files | Clark Tomlinson | 2015-04-29 | 4 | -34/+118 |
|\ \ \ | |||||
| * | | | method shouldn't be static | Bjoern Schiessle | 2015-04-28 | 1 | -1/+1 |
| * | | | also create encryption keys for empty files | Bjoern Schiessle | 2015-04-28 | 2 | -23/+42 |
| * | | | skip update of encryption keys if file is not encrypted | Bjoern Schiessle | 2015-04-28 | 3 | -13/+78 |
* | | | | Merge pull request #15908 from owncloud/fix-replace-with-sed | Vincent Petry | 2015-04-29 | 10 | -10/+10 |
|\ \ \ \ | |||||
| * | | | | Replace `replace` with `sed` statement | Morris Jobke | 2015-04-29 | 10 | -10/+10 |
| |/ / / | |||||
* | | | | Merge pull request #15596 from owncloud/issue/15589 | Morris Jobke | 2015-04-29 | 2 | -9/+31 |
|\ \ \ \ | |||||
| * | | | | Add tests for the correct share id on the call aswell | Joas Schilling | 2015-04-28 | 1 | -3/+15 |
| * | | | | Correctly send Federate-Cloud Share Feedback against the remote share ID | Joas Schilling | 2015-04-28 | 1 | -6/+6 |
| * | | | | check the called URL | Joas Schilling | 2015-04-28 | 1 | -3/+13 |
| * | | | | Correctly generate the feedback URL for remote share | Joas Schilling | 2015-04-28 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #15911 from owncloud/enc_create_header_for_new_key | Björn Schießle | 2015-04-29 | 2 | -3/+14 |
|\ \ \ \ | |||||
| * | | | | make sure that we create a header for the encrypted private key | Bjoern Schiessle | 2015-04-28 | 2 | -3/+14 |
| |/ / / | |||||
* | | | | Merge pull request #15706 from owncloud/fix-15705-master | Lukas Reschke | 2015-04-29 | 2 | -3/+6 |
|\ \ \ \ | |||||
| * | | | | move creation of shared key to the login handler - fixes #15705 | Thomas Müller | 2015-04-17 | 2 | -3/+6 |
* | | | | | Merge pull request #15921 from cmeh/patch-4 | Thomas Müller | 2015-04-29 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update wizardTabElementary.js | cmeh | 2015-04-28 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-29 | 4 | -108/+108 |
|/ / / / | |||||
* | | | | Merge pull request #14764 from owncloud/shared-etag-propagate | Morris Jobke | 2015-04-28 | 22 | -216/+936 |
|\ \ \ \ | |||||
| * | | | | dont pass floats as timestamp to the changepropagator | Robin Appelman | 2015-04-27 | 1 | -1/+1 |
| * | | | | safer teardown | Robin Appelman | 2015-04-27 | 1 | -1/+3 |
| * | | | | use microtime to prevent race conditions | Robin Appelman | 2015-04-27 | 1 | -3/+3 |
| * | | | | cleanup hooks | Robin Appelman | 2015-04-27 | 1 | -0/+7 |
| * | | | | triger propagation for webdav uploads | Robin Appelman | 2015-04-27 | 1 | -3/+3 |
| * | | | | fix merge | Robin Appelman | 2015-04-27 | 4 | -116/+76 |