Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22192 from owncloud/fix_19685 | Thomas Müller | 2016-02-09 | 3 | -7/+35 |
|\ | | | | | 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 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | | | 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 #22252 from owncloud/consolidate-user-set-quota | C. Montero Luque | 2016-02-09 | 5 | -13/+59 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | Avatar should also claim its change | Arthur Schiwon | 2016-02-09 | 1 | -2/+2 |
| | | | |||||
| * | | Doc improvements | Arthur Schiwon | 2016-02-09 | 2 | -3/+5 |
| | | | |||||
| * | | Consolidate getQuota and setQuota methods in User instance | Arthur Schiwon | 2016-02-09 | 4 | -11/+55 |
| | | | |||||
* | | | Move update notification code into app | Lukas Reschke | 2016-02-09 | 1 | -25/+0 |
| | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+39 |
|\ \ \ | |/ / |/| | | Limit comment message to 1k chars | ||||
| * | | on DAV throw Bad Request if provided message is too long | Arthur Schiwon | 2016-02-09 | 1 | -2/+2 |
| | | | |||||
| * | | Limit comment message to 1k chars | Arthur Schiwon | 2016-02-09 | 3 | -1/+39 |
| | | | |||||
* | | | Merge pull request #22225 from owncloud/sharing-moar-hooks | Thomas Müller | 2016-02-09 | 2 | -1/+12 |
|\ \ \ | | | | | | | | | More sharing hooks for extended auditing | ||||
| * | | | Move password update hook after update | Roeland Jago Douma | 2016-02-09 | 1 | -8/+10 |
| | | | | |||||
| * | | | Example hook check | Roeland Jago Douma | 2016-02-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | add post hook on link-share password change | Arthur Schiwon | 2016-02-08 | 1 | -1/+9 |
| |/ / | |||||
* | | | Merge pull request #22212 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2016-02-09 | 7 | -18/+28 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | More fixes | Joas Schilling | 2016-02-09 | 3 | -18/+9 |
| | | | | |||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-08 | 7 | -7/+26 |
| | | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | Merge pull request #22227 from owncloud/appmanager-hooks | Thomas Müller | 2016-02-09 | 3 | -2/+105 |
|\ \ \ \ | | | | | | | | | | | Send events when enabling and disabling of apps | ||||
| * | | | | Send events when enabling and disabling of apps | Arthur Schiwon | 2016-02-09 | 3 | -2/+105 |
| | |/ / | |/| | | |||||
* | | | | Fix part file partial cache logic in encryption code | Vincent Petry | 2016-02-09 | 1 | -1/+7 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encryption code uses partial cache entries for the part file (which are not stored in the database) but are useful for other parts of the code to retrieve the file size again. This means that in the fixed code $info was empty, so getData() could not be called. The fix makes sure to support both cases when the cache entry exists and doesn't. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-09 | 6 | -2/+6 |
|/ / | |||||
* | | Merge pull request #22207 from owncloud/mountcache-exists-check | Thomas Müller | 2016-02-08 | 1 | -1/+1 |
|\ \ | |/ |/| | better exists check for insert mount cache | ||||
| * | better exists check for insert mount cache | Robin Appelman | 2016-02-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #22200 from owncloud/node-checksum-resolvefileinfo | Thomas Müller | 2016-02-08 | 2 | -1/+11 |
|\ \ | | | | | | | Make sure fileinfo exists when calling getCheckSum in node API | ||||
| * | | Add proper throw tags to File | Roeland Jago Douma | 2016-02-08 | 1 | -0/+10 |
| | | | |||||
| * | | Make sure fileinfo exists when calling getCheckSum in node API | Vincent Petry | 2016-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #22164 from owncloud/files_external-verify | Thomas Müller | 2016-02-08 | 1 | -0/+26 |
|\ \ \ | |_|/ |/| | | Add occ command to verify storage configurations | ||||
| * | | Add occ command to verify storage configurations | Robin Appelman | 2016-02-08 | 1 | -0/+26 |
| |/ | |||||
* | | Respect not allowing outgoing shares | Roeland Jago Douma | 2016-02-08 | 3 | -7/+38 |
| | | |||||
* | | Add federated share provider to core | Roeland Jago Douma | 2016-02-08 | 2 | -0/+53 |
|/ | |||||
* | Merge pull request #22156 from owncloud/share2_unshare_ifexpired | Thomas Müller | 2016-02-08 | 2 | -3/+66 |
|\ | | | | | Delete a link share if it is expired on access | ||||
| * | Fix exception on delete | Roeland Jago Douma | 2016-02-06 | 1 | -1/+6 |
| | | |||||
| * | getSharesBy should also expire link shares | Roeland Jago Douma | 2016-02-06 | 2 | -2/+48 |
| | | |||||
| * | Delete expired share when fetched by id | Roeland Jago Douma | 2016-02-06 | 1 | -0/+8 |
| | | |||||
| * | Delete a link share if it is expired on access | Roeland Jago Douma | 2016-02-06 | 1 | -1/+5 |
| | | | | | | | | | | If we access a link share we should check if it has expired already. If so we should remove it and throw a ShareNotFound exception | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-08 | 6 | -0/+8 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-07 | 2 | -0/+4 |
|/ | |||||
* | Merge pull request #22139 from owncloud/comments-files-cleanup | Thomas Müller | 2016-02-06 | 6 | -5/+101 |
|\ | | | | | cleanup jobs for comments and comment read marks | ||||
| * | Move casting to IExpressionBuilder | Joas Schilling | 2016-02-05 | 5 | -5/+100 |
| | | |||||
| * | Remove old background job | Joas Schilling | 2016-02-05 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #22166 from owncloud/remove-local-folder | Thomas Müller | 2016-02-06 | 6 | -58/+0 |
|\ \ | | | | | | | remove unused Storage->getLocalFolder | ||||
| * | | remove unused Storage->getLocalFolder | Robin Appelman | 2016-02-05 | 6 | -58/+0 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-06 | 10 | -0/+10 |
| | | | |||||
* | | | Merge pull request #22169 from owncloud/cache-interface-fixes | Thomas Müller | 2016-02-05 | 2 | -10/+8 |
|\ \ \ | |_|/ |/| | | Cache interface cleanup/phpdoc | ||||
| * | | remove unused Storage->search | Robin Appelman | 2016-02-05 | 1 | -9/+0 |
| | | | |||||
| * | | additional phpdoc for search | Robin Appelman | 2016-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | add deprecation notice to search methods | Robin Appelman | 2016-02-05 | 1 | -0/+7 |
| |/ |