Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Contacts API: replace raw image data with url (#25081) | Georg Ehrke | 2016-06-21 | 11 | -39/+384 |
| | | | | | | | | | | | | | | * add uri to AddressBookImpl array * Introduce ImageExportPlugin for CardDav * add plugin to v1 routes * replace binary contact photo with link * update tests * Adding unit tests | ||||
* | fix broken unit test (#25198) | Thomas Müller | 2016-06-21 | 1 | -1/+8 |
| | |||||
* | Filter out group shares for owner where owner is included (#25190) | Vincent Petry | 2016-06-21 | 2 | -2/+132 |
| | |||||
* | Catch exceptions while creating shared mounts (#25077) | Robin Appelman | 2016-06-20 | 2 | -11/+25 |
| | |||||
* | Don't send activity to non-admins when assigning invisible tags (#25192) | Vincent Petry | 2016-06-20 | 1 | -0/+4 |
| | |||||
* | Merge pull request #25173 from owncloud/fix_conversion_issues | Vincent Petry | 2016-06-20 | 4 | -0/+6 |
|\ | | | | | Fix conversion issues | ||||
| * | Fix conversion issues | Juan Pablo Villafáñez | 2016-06-20 | 4 | -0/+6 |
| | | | | | | | | Change to phpdoc type for automatic conversion | ||||
* | | Merge pull request #25162 from owncloud/password-login-forbidden-hint | Vincent Petry | 2016-06-20 | 3 | -7/+87 |
|\ \ | | | | | | | Password login forbidden hint | ||||
| * | | PasswordLoginForbidden must extend NotAuthenticated | Vincent Petry | 2016-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | The auth code from Sabre will forward NotAuthenticated exceptions but in the case of a generic exception, it is packaged as "service not available". | ||||
| * | | throw PasswordLoginForbidden on DAV | Christoph Wurst | 2016-06-17 | 3 | -3/+60 |
| | | | |||||
| * | | add PasswordLoginForbiddenException | Christoph Wurst | 2016-06-17 | 2 | -6/+29 |
| | | | |||||
* | | | Merge pull request #25159 from owncloud/share-app-initorder | Vincent Petry | 2016-06-20 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Delay files_sharing's registerMountProviders | ||||
| * | | | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
* | | | | Merge pull request #25010 from owncloud/gdrive-fix-tests | Vincent Petry | 2016-06-20 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix GDrive test rename overwrite folder | ||||
| * | | | | Fix GDrive test rename overwrite folder | Vincent Petry | 2016-06-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #25161 from owncloud/fixgetsharefolder | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Make getShareFolder use given view instead of static FS | ||||
| * | | | | | Make getShareFolder use given view instead of static FS | Vincent Petry | 2016-06-17 | 2 | -5/+9 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newline | Vincent Petry | 2016-06-20 | 2 | -3/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | files_external: Keep checkbox and its label on one line | ||||
| * | | | | | files_external: Keep checkbox and its label on one line #20032 #22655 | Markus Goetz | 2016-06-17 | 2 | -3/+7 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Else the checkbox and the decription end up on different lines in my Chrome on OS X | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 10 | -2/+56 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-18 | 4 | -2/+68 |
|/ / / / | |||||
* / / / | Changed global variable to local | Sergio Bertolín | 2016-06-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 18 | -4/+116 |
| | | | |||||
* | | | Merge pull request #24965 from owncloud/streams-0.4.1 | Vincent Petry | 2016-06-16 | 5 | -52/+39 |
|\ \ \ | | | | | | | | | update icewind/streams to 0.4.1 | ||||
| * | | | update icewind/streams to 0.4.1 | Robin Appelman | 2016-06-15 | 5 | -52/+39 |
| | |/ | |/| | |||||
* | | | Move birthday calendar generation to a live migration job (#25135) | Thomas Müller | 2016-06-16 | 5 | -66/+84 |
| | | | |||||
* | | | Merge pull request #25104 from owncloud/dropbox-catchratelimit | Vincent Petry | 2016-06-16 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | ||||
| * | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-14 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder | Vincent Petry | 2016-06-16 | 2 | -1/+43 |
|\ \ \ \ | |_|/ / |/| | | | disable cleanFolder for the federated share storage | ||||
| * | | | disable cleanFolder for the federated share storage | Robin Appelman | 2016-06-14 | 2 | -1/+43 |
| |/ / | |||||
* | | | Merge pull request #25082 from owncloud/fix-sessionless-clients | Vincent Petry | 2016-06-15 | 2 | -14/+6 |
|\ \ \ | | | | | | | | | Fix sessionless clients | ||||
| * | | | create session token only for clients that support cookies | Christoph Wurst | 2016-06-13 | 1 | -12/+5 |
| | | | | |||||
| * | | | create session token on all APIs | Christoph Wurst | 2016-06-13 | 1 | -2/+1 |
| | | | | |||||
* | | | | Update start-swift-ceph.sh (#25109) | Jürgen Weigert | 2016-06-15 | 1 | -0/+3 |
| | | | | | | | | | | | | fix failing https://ci.owncloud.org/job/server-master-linux-externals/database=sqlite,external=swift-ceph,label=SLAVE/ | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-15 | 8 | -2/+10 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-14 | 6 | -0/+56 |
| | | | |||||
* | | | Use proper namespaces - fixes #25078 (#25079) | Thomas Müller | 2016-06-13 | 1 | -1/+2 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 22 | -12/+134 |
| | | |||||
* | | Merge pull request #25003 from owncloud/fix_ocs_path_response | Vincent Petry | 2016-06-10 | 3 | -21/+65 |
|\ \ | |/ |/| | Fix OCS Share API path response | ||||
| * | Extend unit tests | Roeland Jago Douma | 2016-06-07 | 1 | -1/+33 |
| | | |||||
| * | Fix unit tests | Roeland Jago Douma | 2016-06-07 | 2 | -9/+21 |
| | | |||||
| * | Show the path relative to the requesting user | Roeland Jago Douma | 2016-06-07 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | A share can only be requested by 3 'types' of people * owner * initiator * recipient So we have to get the path as the current user. Since that is the only path that has any meaning to the user. | ||||
* | | Merge pull request #24990 from owncloud/fix_24868 | Vincent Petry | 2016-06-10 | 1 | -6/+3 |
|\ \ | | | | | | | Wrap publicwebdav in sharePermission mask | ||||
| * | | Wrap publicwebdav in sharePermission mask | Roeland Jago Douma | 2016-06-06 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24868 The writable mask was a bit misleading. We should wrap with the sharepermissions (as they are used everywhere else). The PERMISSIONS_SHARE are added since that is required for the public link check plugin. | ||||
* | | | Merge pull request #24080 from owncloud/support-calendar-class-property | Vincent Petry | 2016-06-10 | 11 | -153/+751 |
|\ \ \ | | | | | | | | | Extract CLASS property from calendar object and store it in the database | ||||
| * | | | Filter confidential calendar objects in shared calendars | Thomas Müller | 2016-06-09 | 4 | -3/+322 |
| | | | | | | | | | | | | | | | | Filter private calendar objects in shared calendars | ||||
| * | | | Added unit testing for the migration step | Thomas Müller | 2016-06-09 | 5 | -126/+254 |
| | | | | |||||
| * | | | Implement classification migration as repair step | Thomas Müller | 2016-06-09 | 5 | -58/+106 |
| | | | | |||||
| * | | | Bump dav app version and fix variable rename | Thomas Müller | 2016-06-09 | 2 | -3/+3 |
| | | | | |||||
| * | | | Add migration step | Thomas Müller | 2016-06-09 | 4 | -1/+61 |
| | | | |