aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dispatch an event when a console command is runJoas Schilling2016-02-053-5/+87
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-0514-2/+46
* Merge pull request #22133 from owncloud/add-check-for-contentThomas Müller2016-02-041-1/+1
|\
| * Add check for contentLukas Reschke2016-02-041-1/+1
* | Merge pull request #22130 from owncloud/fix-jsunit-filesclientThomas Müller2016-02-042-148/+142
|\ \
| * | Fix JS DAV files client unit testsVincent Petry2016-02-041-146/+140
| * | Small fixes in Dav files clientVincent Petry2016-02-041-2/+2
* | | Merge pull request #21766 from farukuzun/masterThomas Müller2016-02-046-1/+59
|\ \ \
| * | | Introduce some mimetypes for richdocumentsFaruk Uzun2016-02-046-1/+59
* | | | Merge pull request #22107 from owncloud/external-auth-globalThomas Müller2016-02-049-3/+156
|\ \ \ \
| * | | | Add global auth backend for files externalRobin Appelman2016-02-049-3/+156
| | |/ / | |/| |
* | | | Merge pull request #22111 from owncloud/use-intermediate-certificateThomas Müller2016-02-047-81/+135
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add proper line endingLukas Reschke2016-02-031-1/+1
| * | | Also check daily and testing channelLukas Reschke2016-02-031-0/+2
| * | | Allow specifing the signing pathLukas Reschke2016-02-035-24/+46
| * | | Use intermediate root authorityLukas Reschke2016-02-032-57/+87
* | | | Merge pull request #22124 from owncloud/comments-author-checkThomas Müller2016-02-042-1/+184
|\ \ \ \
| * | | | Check for authorship on edit and delete attemptsArthur Schiwon2016-02-042-1/+184
| | |_|/ | |/| |
* | | | Merge pull request #22126 from owncloud/share2_lazy_sharesThomas Müller2016-02-047-77/+375
|\ \ \ \ | |_|_|/ |/| | |
| * | | Also add type (file/folder) to IShare objectRoeland Jago Douma2016-02-045-3/+147
| * | | Unit test for delete lazy sharesRoeland Jago Douma2016-02-041-0/+33
| * | | Add unit testsRoeland Jago Douma2016-02-041-0/+79
| * | | Make the share object lazyRoeland Jago Douma2016-02-047-74/+116
| |/ /
* | | Merge pull request #22121 from owncloud/comments-deleteduserThomas Müller2016-02-042-5/+24
|\ \ \ | |/ / |/| |
| * | Special label for deleted users in comments listVincent Petry2016-02-042-5/+24
* | | Merge pull request #22025 from owncloud/21838-jenkinsThomas Müller2016-02-045-5/+109
|\ \ \ | |/ / |/| |
| * | fix unit testsArthur Schiwon2016-02-031-4/+9
| * | change error loggingalexweirig2016-02-031-1/+1
| * | Fixed undefined variable $dnGroup and variable namealexweirig2016-02-031-7/+7
| * | Refactored code to avoid performance problemalexweirig2016-02-031-41/+37
| * | code changes for user_ldap Dynamic Group MembershipAlex Weirig2016-02-034-5/+108
* | | Merge pull request #22110 from owncloud/comment-types-always-pluralThomas Müller2016-02-047-45/+45
|\ \ \
| * | | types shall always be pluralArthur Schiwon2016-02-037-45/+45
| | |/ | |/|
* | | Merge pull request #22103 from ErikPel/tag-css-fixThomas Müller2016-02-041-1/+7
|\ \ \
| * | | Fixes #22097Erik Pellikka2016-02-031-1/+7
* | | | Merge pull request #21964 from owncloud/calendar-sharing-3Thomas Müller2016-02-0428-129/+1149
|\ \ \ \
| * | | | Remove entries in dav_shares on deletion of a calendarThomas Müller2016-02-033-4/+14
| * | | | Adding propfind property to retrieve sharee information from a dav resourceThomas Müller2016-02-035-4/+201
| * | | | Deleting a shared address book results in unshareThomas Müller2016-02-035-11/+200
| * | | | Deleting a shared calendar results in unshareThomas Müller2016-02-033-2/+122
| * | | | Disallow to share with the owner of the resourceThomas Müller2016-02-031-5/+15
| * | | | Fix ACLs on shared calendarsThomas Müller2016-02-034-30/+98
| * | | | No duplicate address book if shared with user and group and the user is part ...Thomas Müller2016-02-032-6/+33
| * | | | No duplicate calendars if shared with user and group and the user is part of ...Thomas Müller2016-02-032-6/+34
| * | | | Add calendar sharingThomas Müller2016-02-0320-121/+492
* | | | | Merge pull request #22108 from owncloud/comments-editThomas Müller2016-02-044-44/+332
|\ \ \ \ \
| * | | | | Added unit tests for edit/delete commentsVincent Petry2016-02-031-0/+134
| * | | | | Move comment delete action into edit modeVincent Petry2016-02-032-14/+21
| * | | | | Comment owner can now edit or deleteVincent Petry2016-02-033-38/+185
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22072 from vincchan/trim-newusername-whitespaceThomas Müller2016-02-041-0/+4
|\ \ \ \ \