Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make the share object lazy | Roeland Jago Douma | 2016-02-04 | 7 | -74/+116 |
* | Merge pull request #22025 from owncloud/21838-jenkins | Thomas Müller | 2016-02-04 | 5 | -5/+109 |
|\ | |||||
| * | fix unit tests | Arthur Schiwon | 2016-02-03 | 1 | -4/+9 |
| * | change error logging | alexweirig | 2016-02-03 | 1 | -1/+1 |
| * | Fixed undefined variable $dnGroup and variable name | alexweirig | 2016-02-03 | 1 | -7/+7 |
| * | Refactored code to avoid performance problem | alexweirig | 2016-02-03 | 1 | -41/+37 |
| * | code changes for user_ldap Dynamic Group Membership | Alex Weirig | 2016-02-03 | 4 | -5/+108 |
* | | Merge pull request #22110 from owncloud/comment-types-always-plural | Thomas Müller | 2016-02-04 | 7 | -45/+45 |
|\ \ | |||||
| * | | 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 | Erik Pellikka | 2016-02-03 | 1 | -1/+7 |
* | | | | Merge pull request #21964 from owncloud/calendar-sharing-3 | Thomas Müller | 2016-02-04 | 28 | -129/+1149 |
|\ \ \ \ | |||||
| * | | | | 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 |
| * | | | | No duplicate calendars if shared with user and group and the user is part of ... | Thomas Müller | 2016-02-03 | 2 | -6/+34 |
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | move whitspace check to user manager | Vincent Chan | 2016-02-03 | 2 | -6/+4 |
| * | | | | | Do not allow username to have space at the beginning or at the end | Vincent Chan | 2016-02-02 | 1 | -0/+6 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-04 | 4 | -0/+4 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #22101 from owncloud/comments-filerow | Thomas Müller | 2016-02-03 | 13 | -12/+430 |
|\ \ \ \ \ | |||||
| * | | | | | Reset comments read marker after loading comments | Vincent Petry | 2016-02-03 | 8 | -11/+235 |
| * | | | | | Add file row indicator for unread comments | Vincent Petry | 2016-02-03 | 6 | -1/+195 |
* | | | | | | Merge pull request #22088 from owncloud/share2_ishare | Thomas Müller | 2016-02-03 | 13 | -690/+603 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | [Share 2.0] Fix public link sharing | Roeland Jago Douma | 2016-02-03 | 2 | -26/+32 |
| * | | | | | [Share 2.0] Fix OCS endpoint | Roeland Jago Douma | 2016-02-03 | 2 | -108/+123 |
| * | | | | | [Share 2.0] Fix shareManager | Roeland Jago Douma | 2016-02-03 | 4 | -233/+254 |
| * | | | | | [Share 2.0] Fix defaultshare provider | Roeland Jago Douma | 2016-02-03 | 3 | -307/+169 |
| * | | | | | [Share 2.0] Use strings for ids | Roeland Jago Douma | 2016-02-03 | 3 | -17/+26 |
|/ / / / / | |||||
* | | | | | Merge pull request #22106 from owncloud/use-newly-generated-keys | Daniel Molkentin | 2016-02-03 | 4 | -155/+57 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Use newly generated certificate authority | Lukas Reschke | 2016-02-03 | 4 | -155/+57 |
|/ / / / | |||||
* | | | | Merge pull request #22086 from RealRancor/RealRancor-patch-1 | Thomas Müller | 2016-02-03 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove files_locking from shipped.json | RealRancor | 2016-02-03 | 1 | -1/+0 |
* | | | | | Merge pull request #22095 from owncloud/public_link_with_port | Thomas Müller | 2016-02-03 | 3 | -12/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Construct valid URL | Roeland Jago Douma | 2016-02-03 | 2 | -10/+4 |
| * | | | | | host and hostname are different things | Roeland Jago Douma | 2016-02-03 | 1 | -2/+19 |
| |/ / / / | |||||
* | | | | | Merge pull request #22071 from owncloud/cache-split-insert | Thomas Müller | 2016-02-03 | 4 | -44/+90 |
|\ \ \ \ \ | |||||
| * | | | | | split cache->insert from cache->put | Robin Appelman | 2016-02-03 | 4 | -44/+90 |
* | | | | | | Merge pull request #22098 from owncloud/cleanup-core-apps | Thomas Müller | 2016-02-03 | 6 | -12/+4 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Make sure tests don't leave a stray directory behind | Joas Schilling | 2016-02-03 | 1 | -3/+3 |
| * | | | | | Make sure encryption has a valid licence tag | Joas Schilling | 2016-02-03 | 1 | -1/+1 |