Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | always use default cipher for write operations, no matter how the file was ↵ | Björn Schießle | 2016-02-09 | 1 | -3/+3 |
| | | | | encrypted before | ||||
* | make it backward compatible to work with signed and un-signed files | Björn Schießle | 2016-02-09 | 5 | -18/+34 |
| | |||||
* | sign all encrypted blocks and check signature on decrypt | Björn Schießle | 2016-02-09 | 8 | -33/+133 |
| | |||||
* | Add note about the addPadding function | Lukas Reschke | 2016-02-09 | 1 | -0/+4 |
| | |||||
* | Use an actual 16 byte long IV | Lukas Reschke | 2016-02-09 | 1 | -17/+2 |
| | | | | The previous IV was actually 12 byte extended to 16 byte using base64. As the encrypted file should be fine with containing binary data as well we can simply remove the encoding like that here. | ||||
* | Use AES-256-CTR as default | Lukas Reschke | 2016-02-09 | 2 | -26/+68 |
| | | | | CTR is recommended over CFB mode. | ||||
* | Merge pull request #22192 from owncloud/fix_19685 | Thomas Müller | 2016-02-09 | 4 | -7/+51 |
|\ | | | | | Only set the default expiration date on share creation | ||||
| * | Catch exception | Roeland Jago Douma | 2016-02-09 | 1 | -4/+17 |
| | | |||||
| * | Throw exception | Roeland Jago Douma | 2016-02-09 | 3 | -5/+17 |
| | | |||||
| * | Only set the default expiration date on share creation | Roeland Jago Douma | 2016-02-09 | 4 | -2/+21 |
| | | | | | | | | | | | | | | | | | | Fixes #19685 The default expiration date should only be set when we create a new share. So if a share is created and the expiration date is unset. And after that the password is updated the expiration date should remain unset. | ||||
* | | Merge pull request #22246 from ↵ | Thomas Müller | 2016-02-09 | 1 | -10/+12 |
|\ \ | | | | | | | | | | | | | owncloud/register-process-control-signal-handler-later Register process control signel handlers only on execution of the com… | ||||
| * | | Register process control signel handlers only on execution of the command | Thomas Müller | 2016-02-09 | 1 | -10/+12 |
| | | | |||||
* | | | Merge pull request #22255 from owncloud/add-sso-for-updatechecker | Thomas Müller | 2016-02-09 | 12 | -1/+491 |
|\ \ \ | | | | | | | | | Add SSO for updater application | ||||
| * | | | Add SSO for updater application | Lukas Reschke | 2016-02-09 | 12 | -1/+491 |
| | | | | | | | | | | | | | | | | Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater". | ||||
* | | | | Merge pull request #22251 from owncloud/smb-105 | Thomas Müller | 2016-02-09 | 16 | -38/+215 |
|\ \ \ \ | | | | | | | | | | | update icewind/smb to 1.0.5 | ||||
| * | | | | update icewind/smb to 1.0.5 | Robin Appelman | 2016-02-09 | 16 | -38/+215 |
| | | | | | |||||
* | | | | | Merge pull request #22249 from owncloud/fix-22245 | Thomas Müller | 2016-02-09 | 1 | -0/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Save display name and email address on paste operations | ||||
| * | | | | | Save display name and email address on paste operations - fixes #22245 | Thomas Müller | 2016-02-09 | 1 | -0/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20928 from owncloud/publicdav-check-permissions | C. Montero Luque | 2016-02-09 | 5 | -2/+139 |
|\ \ \ \ \ | | | | | | | | | | | | | Check that the owner of a link share still has share permissions on access | ||||
| * | | | | | add tests | Robin Appelman | 2016-02-09 | 1 | -0/+49 |
| | | | | | | |||||
| * | | | | | Fix unit tests | Roeland Jago Douma | 2016-02-09 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | check share permissions in share controller | Robin Appelman | 2016-02-09 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Check that the owner of a link share still has share permissions on access | Robin Appelman | 2016-02-09 | 3 | -2/+71 |
| | | | | | | |||||
* | | | | | | Merge pull request #22252 from owncloud/consolidate-user-set-quota | C. Montero Luque | 2016-02-09 | 14 | -94/+162 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Consolidate getQuota and setQuota methods in User instance | ||||
| * | | | | | revolutionar: change updates might even sent the new value (optional) | Arthur Schiwon | 2016-02-09 | 2 | -7/+7 |
| | | | | | | |||||
| * | | | | | More fixed tests :) | Arthur Schiwon | 2016-02-09 | 2 | -40/+45 |
| | | | | | | |||||
| * | | | | | Avatar should also claim its change | Arthur Schiwon | 2016-02-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Doc improvements | Arthur Schiwon | 2016-02-09 | 2 | -3/+5 |
| | | | | | | |||||
| * | | | | | fix tests | Arthur Schiwon | 2016-02-09 | 1 | -29/+51 |
| | | | | | | |||||
| * | | | | | Consolidate getQuota and setQuota methods in User instance | Arthur Schiwon | 2016-02-09 | 10 | -23/+62 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22238 from owncloud/add-link-to-updater | Lukas Reschke | 2016-02-09 | 9 | -33/+210 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Move update notification code into app | ||||
| * | | | | Move update notification code into app | Lukas Reschke | 2016-02-09 | 9 | -33/+210 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small. Furthermore also makes some more code unit-testable... | ||||
* | | | | Merge pull request #22228 from owncloud/comments-limit-message | Thomas Müller | 2016-02-09 | 8 | -1/+191 |
|\ \ \ \ | | | | | | | | | | | Limit comment message to 1k chars | ||||
| * | | | | on DAV throw Bad Request if provided message is too long | Arthur Schiwon | 2016-02-09 | 5 | -2/+144 |
| | | | | | |||||
| * | | | | Limit comment message to 1k chars | Arthur Schiwon | 2016-02-09 | 4 | -1/+49 |
| | | | | | |||||
* | | | | | Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-add | Thomas Müller | 2016-02-09 | 5 | -36/+46 |
|\ \ \ \ \ | | | | | | | | | | | | | Forward exception message to the admin in case of errors and in case … | ||||
| * | | | | | Forward exception message to the admin in case of errors and in case the ↵ | Thomas Müller | 2016-02-09 | 5 | -36/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | remote server version is to low and appropriate message is displayed as well | ||||
* | | | | | | Merge pull request #20571 from owncloud/transfer-ownership | Thomas Müller | 2016-02-09 | 3 | -2/+235 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Introduce console command to transfer ownerships of files | ||||
| * | | | | | Adjust command description | Thomas Müller | 2016-02-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Set share owner and share initiator on upate as well | Thomas Müller | 2016-02-09 | 3 | -9/+4 |
| | | | | | | |||||
| * | | | | | Introduce console command to transfer ownerships of files - refs #19154 | Thomas Müller | 2016-02-09 | 2 | -2/+240 |
|/ / / / / | |||||
* | | | | | Merge pull request #22234 from owncloud/systemtags-filter-intersect-empty | Thomas Müller | 2016-02-09 | 2 | -19/+113 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix system tag filter AND condition | ||||
| * | | | | | Stop when a mid result is empty | Joas Schilling | 2016-02-09 | 1 | -2/+8 |
| | | | | | | |||||
| * | | | | | Add a test for empty mid-result | Joas Schilling | 2016-02-09 | 1 | -23/+84 |
| | | | | | | |||||
| * | | | | | Fix system tag filter AND condition | Vincent Petry | 2016-02-09 | 2 | -0/+27 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | If one of the results is empty, no need to do array_intersect and return an empty result directly. | ||||
* | | | | | Merge pull request #21773 from owncloud/files_external-list-authtype | Thomas Müller | 2016-02-09 | 3 | -3/+72 |
|\ \ \ \ \ | | | | | | | | | | | | | Show the proper auth identifier when listing mounts as json | ||||
| * | | | | | add tests | Robin Appelman | 2016-02-04 | 1 | -0/+69 |
| | | | | | | |||||
| * | | | | | update import logic for the new export logic | Robin Appelman | 2016-02-04 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Show the proper auth identifier when listing mounts as json | Robin Appelman | 2016-02-04 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #21893 from owncloud/migrate-calendars | Thomas Müller | 2016-02-09 | 11 | -11/+801 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Migrate calendars |