Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Dispatch an event when a console command is run | Joas Schilling | 2016-02-05 | 3 | -5/+87 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-05 | 14 | -2/+46 |
| | |||||
* | Merge pull request #22133 from owncloud/add-check-for-content | Thomas Müller | 2016-02-04 | 1 | -1/+1 |
|\ | | | | | Add check for content | ||||
| * | Add check for content | Lukas Reschke | 2016-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | The response may be a redirect which is always followed by jQuery. Thus leading to false positives depending on the server configuration (e.g. when it issues a 302) To prevent that there is also a check performed on the response content. | ||||
* | | Merge pull request #22130 from owncloud/fix-jsunit-filesclient | Thomas Müller | 2016-02-04 | 2 | -148/+142 |
|\ \ | | | | | | | Fix jsunit filesclient | ||||
| * | | Fix JS DAV files client unit tests | Vincent Petry | 2016-02-04 | 1 | -146/+140 |
| | | | | | | | | | | | | | | | Instead of trying to mock the promise, just stub davclient.js' request object. | ||||
| * | | Small fixes in Dav files client | Vincent Petry | 2016-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Remove double leading slash in path. Add utf-8 in default content type. | ||||
* | | | Merge pull request #21766 from farukuzun/master | Thomas Müller | 2016-02-04 | 6 | -1/+59 |
|\ \ \ | | | | | | | | | Add some mimetypes | ||||
| * | | | Introduce some mimetypes for richdocuments | Faruk Uzun | 2016-02-04 | 6 | -1/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * application/vnd.lotus-wordpro * application/vnd.visio * application/vnd.wordperfect * application/msonenote | ||||
* | | | | Merge pull request #22107 from owncloud/external-auth-global | Thomas Müller | 2016-02-04 | 9 | -3/+156 |
|\ \ \ \ | | | | | | | | | | | Add global auth backend for files external | ||||
| * | | | | Add global auth backend for files external | Robin Appelman | 2016-02-04 | 9 | -3/+156 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22111 from owncloud/use-intermediate-certificate | Thomas Müller | 2016-02-04 | 7 | -81/+135 |
|\ \ \ \ | |_|_|/ |/| | | | Use intermediate root authority + sign other release channels | ||||
| * | | | Add proper line ending | Lukas Reschke | 2016-02-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Also check daily and testing channel | Lukas Reschke | 2016-02-03 | 1 | -0/+2 |
| | | | | |||||
| * | | | Allow specifing the signing path | Lukas Reschke | 2016-02-03 | 5 | -24/+46 |
| | | | | |||||
| * | | | Use intermediate root authority | Lukas Reschke | 2016-02-03 | 2 | -57/+87 |
| | | | | | | | | | | | | | | | | Danimo proposed to use an intermediate root authority for signing purposes which makes sense considering that we may also sign updates this way in the future. So this uses now an intermediate authority. | ||||
* | | | | Merge pull request #22124 from owncloud/comments-author-check | Thomas Müller | 2016-02-04 | 2 | -1/+184 |
|\ \ \ \ | | | | | | | | | | | Check for authorship on edit attempt | ||||
| * | | | | Check for authorship on edit and delete attempts | Arthur Schiwon | 2016-02-04 | 2 | -1/+184 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #22126 from owncloud/share2_lazy_shares | Thomas Müller | 2016-02-04 | 7 | -77/+375 |
|\ \ \ \ | |_|_|/ |/| | | | Lazy shares | ||||
| * | | | Also add type (file/folder) to IShare object | Roeland Jago Douma | 2016-02-04 | 5 | -3/+147 |
| | | | | | | | | | | | | | | | | We need this for the hooks :( | ||||
| * | | | Unit test for delete lazy shares | Roeland Jago Douma | 2016-02-04 | 1 | -0/+33 |
| | | | | |||||
| * | | | Add unit tests | Roeland Jago Douma | 2016-02-04 | 1 | -0/+79 |
| | | | | |||||
| * | | | Make the share object lazy | Roeland Jago Douma | 2016-02-04 | 7 | -74/+116 |
| |/ / | | | | | | | | | | | | | Share providers can now just pass in a fileId. And the node will only be created once needed. | ||||
* | | | Merge pull request #22121 from owncloud/comments-deleteduser | Thomas Müller | 2016-02-04 | 2 | -5/+24 |
|\ \ \ | |/ / |/| | | Special label for deleted users in comments list | ||||
| * | | Special label for deleted users in comments list | Vincent Petry | 2016-02-04 | 2 | -5/+24 |
| | | | |||||
* | | | Merge pull request #22025 from owncloud/21838-jenkins | Thomas Müller | 2016-02-04 | 5 | -5/+109 |
|\ \ \ | |/ / |/| | | [jenkins] + rebased, of #21838 | ||||
| * | | fix unit tests | Arthur Schiwon | 2016-02-03 | 1 | -4/+9 |
| | | | |||||
| * | | change error logging | alexweirig | 2016-02-03 | 1 | -1/+1 |
| | | | | | | | | | replaced variable with print_r call | ||||
| * | | Fixed undefined variable $dnGroup and variable name | alexweirig | 2016-02-03 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | I renamed $memberURL into $dynamicGroup and print that variable in the writeLog. I think this makes more sense. | ||||
| * | | Refactored code to avoid performance problem | alexweirig | 2016-02-03 | 1 | -41/+37 |
| | | | | | | | | | | | | | | | Moved the dynamic group processing to the top and removed condition in memberOf processing. Also, changed variable name $value to $memberUrl | ||||
| * | | code changes for user_ldap Dynamic Group Membership | Alex Weirig | 2016-02-03 | 4 | -5/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new setting of “Dynamic Group Member URL” (ldapDynamicGroupMemberURL) - see LDAP settings advanced tab. Added public function getDynamicGroupMembers. Updated function _groupMembers. Updated function getUserGroups. | ||||
* | | | Merge pull request #22110 from owncloud/comment-types-always-plural | Thomas Müller | 2016-02-04 | 7 | -45/+45 |
|\ \ \ | | | | | | | | | types shall always be plural | ||||
| * | | | types shall always be plural | Arthur Schiwon | 2016-02-03 | 7 | -45/+45 |
| | |/ | |/| | |||||
* | | | Merge pull request #22103 from ErikPel/tag-css-fix | Thomas Müller | 2016-02-04 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Fixes #22097 | ||||
| * | | | Fixes #22097 | Erik Pellikka | 2016-02-03 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated with more specific css selector Moved the curly brace to the same line as the selector firefox fix | ||||
* | | | | Merge pull request #21964 from owncloud/calendar-sharing-3 | Thomas Müller | 2016-02-04 | 28 | -129/+1149 |
|\ \ \ \ | | | | | | | | | | | Add calendar sharing | ||||
| * | | | | Remove entries in dav_shares on deletion of a calendar | Thomas Müller | 2016-02-03 | 3 | -4/+14 |
| | | | | | |||||
| * | | | | Adding propfind property to retrieve sharee information from a dav resource | Thomas Müller | 2016-02-03 | 5 | -4/+201 |
| | | | | | |||||
| * | | | | Deleting a shared address book results in unshare | Thomas Müller | 2016-02-03 | 5 | -11/+200 |
| | | | | | |||||
| * | | | | Deleting a shared calendar results in unshare | Thomas Müller | 2016-02-03 | 3 | -2/+122 |
| | | | | | |||||
| * | | | | Disallow to share with the owner of the resource | Thomas Müller | 2016-02-03 | 1 | -5/+15 |
| | | | | | |||||
| * | | | | Fix ACLs on shared calendars | Thomas Müller | 2016-02-03 | 4 | -30/+98 |
| | | | | | |||||
| * | | | | No duplicate address book if shared with user and group and the user is part ↵ | Thomas Müller | 2016-02-03 | 2 | -6/+33 |
| | | | | | | | | | | | | | | | | | | | | of the group | ||||
| * | | | | No duplicate calendars if shared with user and group and the user is part of ↵ | Thomas Müller | 2016-02-03 | 2 | -6/+34 |
| | | | | | | | | | | | | | | | | | | | | the group | ||||
| * | | | | Add calendar sharing | Thomas Müller | 2016-02-03 | 20 | -121/+492 |
| | | | | | |||||
* | | | | | Merge pull request #22108 from owncloud/comments-edit | Thomas Müller | 2016-02-04 | 4 | -44/+332 |
|\ \ \ \ \ | | | | | | | | | | | | | Comment owner can now edit or delete | ||||
| * | | | | | Added unit tests for edit/delete comments | Vincent Petry | 2016-02-03 | 1 | -0/+134 |
| | | | | | | |||||
| * | | | | | Move comment delete action into edit mode | Vincent Petry | 2016-02-03 | 2 | -14/+21 |
| | | | | | | |||||
| * | | | | | Comment owner can now edit or delete | Vincent Petry | 2016-02-03 | 3 | -38/+185 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #22072 from vincchan/trim-newusername-whitespace | Thomas Müller | 2016-02-04 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not allow username to have whitespace at the beginning or at the end |