Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 6 | -50/+50 |
|\ \ | | | | | | | Consolidate getQuota and setQuota methods in User instance | ||||
| * | | More fixed tests :) | Arthur Schiwon | 2016-02-09 | 2 | -40/+45 |
| | | | |||||
| * | | Consolidate getQuota and setQuota methods in User instance | Arthur Schiwon | 2016-02-09 | 4 | -10/+5 |
| | | | |||||
* | | | Move update notification code into app | Lukas Reschke | 2016-02-09 | 5 | -0/+235 |
| | | | | | | | | | | | | | | | | | | 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 | 4 | -0/+142 |
|\ \ \ | | | | | | | | | Limit comment message to 1k chars | ||||
| * | | | on DAV throw Bad Request if provided message is too long | Arthur Schiwon | 2016-02-09 | 4 | -0/+142 |
| | | | | |||||
* | | | | 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 | ||||
* | | | | | 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 | ||||
| * | | | | Migration of calendars | Thomas Müller | 2016-02-09 | 11 | -11/+801 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22197 from owncloud/files-filterbysystemtags | Thomas Müller | 2016-02-09 | 13 | -7/+695 |
|\ \ \ \ | | | | | | | | | | | Add file list filter to filter by system tags | ||||
| * | | | | Fix unit tests for system tag filter section | Vincent Petry | 2016-02-09 | 2 | -7/+20 |
| | | | | | |||||
| * | | | | Add system tags filter section for files app | Vincent Petry | 2016-02-09 | 10 | -1/+666 |
| | | | | | |||||
| * | | | | Fix elementToFile to also return path when defined | Vincent Petry | 2016-02-08 | 2 | -0/+10 |
| | |_|/ | |/| | | | | | | | | | | | | | | Fixes issue when opening the share dialog for a file inside the favorite list, and the file is from a subfolder | ||||
* | | | | Merge pull request #22202 from owncloud/global-auth-no-user | Thomas Müller | 2016-02-09 | 2 | -2/+119 |
|\ \ \ \ | | | | | | | | | | | handle no user set for personal global auth | ||||
| * | | | | Add tests | Robin Appelman | 2016-02-08 | 2 | -2/+117 |
| | | | | | |||||
| * | | | | handle no user set for personal global auth | Robin Appelman | 2016-02-08 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #22225 from owncloud/sharing-moar-hooks | Thomas Müller | 2016-02-09 | 2 | -7/+76 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | More sharing hooks for extended auditing | ||||
| * | | | | Example hook check | Roeland Jago Douma | 2016-02-09 | 2 | -14/+26 |
| | | | | | |||||
| * | | | | Fix unit test | Roeland Jago Douma | 2016-02-09 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | throw hooks when accessing a link share | Arthur Schiwon | 2016-02-09 | 1 | -2/+55 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22199 from owncloud/multiple_checksums | Thomas Müller | 2016-02-09 | 2 | -8/+75 |
|\ \ \ \ | | | | | | | | | | | Make checksum propfind future proof | ||||
| * | | | | For possible future usage allow multiple checksums | Roeland Jago Douma | 2016-02-08 | 2 | -8/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of returning <oc:checksum>TYPE:CHECKSUM</oc:checksum> Return <oc:checksums> <oc:checksum>TYPE:CHECKSUM</oc:checksum> </oc:checksums> This will allow us to expand in the future to multiple checksums. Without doing just string concatenation. And even for a single checksum it is now correct. | ||||
* | | | | | Merge pull request #22217 from owncloud/fix_22215 | Thomas Müller | 2016-02-09 | 1 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Federates shares have to set a file_target | ||||
| * | | | | | Federates shares have to set a file_target | Roeland Jago Douma | 2016-02-08 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code path is still used to get the sharing info in the webui. This requires the file_target to be set. This does not mean anything for federated shares. Fixes #22215 | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-09 | 12 | -14/+50 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #22112 from owncloud/dav-filesreport | Thomas Müller | 2016-02-08 | 3 | -1/+850 |
|\ \ \ \ \ | | | | | | | | | | | | | Provide REPORT method on files DAV to filter/search files | ||||
| * | | | | | Add REPORT on files endpoint for filtering | Vincent Petry | 2016-02-08 | 3 | -1/+850 |
| |/ / / / | | | | | | | | | | | | | | | | For now only supports filtering by system tags | ||||
* | | | | | Merge pull request #22211 from owncloud/versions-hook-info | Thomas Müller | 2016-02-08 | 2 | -9/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | versions provide more information when throwing hooks | ||||
| * | | | | | use int values and constants instead of strings | Arthur Schiwon | 2016-02-08 | 1 | -8/+12 |
| | | | | | | |||||
| * | | | | | versions provide more information when throwing hooks | Arthur Schiwon | 2016-02-08 | 2 | -9/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #22206 from owncloud/share2_migration_with_federated | Thomas Müller | 2016-02-08 | 4 | -6/+25 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Update the migration step to include federated shares | ||||
| * | | | | Update the migration step to include federated shares | Roeland Jago Douma | 2016-02-08 | 4 | -6/+25 |
| |/ / / | | | | | | | | | | | | | | | | | Now federated shares will also be updated to the flat reshare model. | ||||
* | | | | Merge pull request #21817 from owncloud/support-old-carddav-endpoint | Thomas Müller | 2016-02-08 | 9 | -29/+193 |
|\ \ \ \ | | | | | | | | | | | Adding pre oc 9.0 CardDAV endpoint for migration of old clients |