summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22025 from owncloud/21838-jenkinsThomas Müller2016-02-045-5/+109
|\ | | | | [jenkins] + rebased, of #21838
| * fix unit testsArthur Schiwon2016-02-031-4/+9
| |
| * change error loggingalexweirig2016-02-031-1/+1
| | | | | | replaced variable with print_r call
| * Fixed undefined variable $dnGroup and variable namealexweirig2016-02-031-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 problemalexweirig2016-02-031-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 MembershipAlex Weirig2016-02-034-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 #21964 from owncloud/calendar-sharing-3Thomas Müller2016-02-0428-129/+1149
|\ \ | | | | | | Add calendar sharing
| * | 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
| | | | | | | | | | | | of the group
| * | No duplicate calendars if shared with user and group and the user is part of ↵Thomas Müller2016-02-032-6/+34
| | | | | | | | | | | | the group
| * | Add calendar sharingThomas Müller2016-02-0320-121/+492
| | |
* | | Merge pull request #22108 from owncloud/comments-editThomas Müller2016-02-044-44/+332
|\ \ \ | | | | | | | | Comment owner can now edit or delete
| * | | 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
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2016-02-044-0/+4
|/ /
* | Merge pull request #22101 from owncloud/comments-filerowThomas Müller2016-02-0310-11/+424
|\ \ | | | | | | Add file row indicator for unread comments
| * | Reset comments read marker after loading commentsVincent Petry2016-02-037-11/+234
| | |
| * | Add file row indicator for unread commentsVincent Petry2016-02-033-0/+190
| | |
* | | [Share 2.0] Fix public link sharingRoeland Jago Douma2016-02-032-26/+32
| | |
* | | [Share 2.0] Fix OCS endpointRoeland Jago Douma2016-02-032-108/+123
| |/ |/|
* | Merge pull request #22095 from owncloud/public_link_with_portThomas Müller2016-02-032-10/+4
|\ \ | | | | | | Public link downloads should work on instance on non default port
| * | Construct valid URLRoeland Jago Douma2016-02-032-10/+4
| | |
* | | Merge pull request #22098 from owncloud/cleanup-core-appsThomas Müller2016-02-035-9/+1
|\ \ \ | | | | | | | | Cleanup core apps
| * | | Make sure encryption has a valid licence tagJoas Schilling2016-02-031-1/+1
| | | |
| * | | Remove deprecated and unused standalone tagJoas Schilling2016-02-032-2/+0
| | | |
| * | | Remove invalid app user doc linksJoas Schilling2016-02-032-6/+0
| | |/ | |/|
* | | Merge pull request #22070 from owncloud/share2_exceptionsThomas Müller2016-02-034-33/+14
|\ \ \ | |/ / |/| | Add sharing exceptions to OCP
| * | [Share 2.0] Use GenericShareExceptionRoeland Jago Douma2016-02-022-28/+8
| | |
| * | [Share 2.0] Add exceptions to OCPRoeland Jago Douma2016-02-024-8/+9
| | |
* | | Merge pull request #21997 from owncloud/checksumsThomas Müller2016-02-032-2/+37
|\ \ \ | |_|/ |/| | Checksums
| * | Add store/retrieve checksumsRoeland Jago Douma2016-02-032-2/+37
| | | | | | | | | | | | | | | | | | | | | * Add extra db column to filecache * Bump version * Update filecache code to actually handle checksum * Webdav code to store/retrieve checksums
* | | Merge pull request #21772 from owncloud/occ-external-applicableThomas Müller2016-02-034-0/+432
|\ \ \ | | | | | | | | Add occ command to manage applicables
| * | | Add occ command to manage applicablesRobin Appelman2016-02-024-0/+432
| | | |
* | | | Merge pull request #21961 from owncloud/comments-guiThomas Müller2016-02-0310-0/+858
|\ \ \ \ | |_|/ / |/| | | Comments GUI in files sidebar
| * | | Fixed report nameVincent Petry2016-02-021-2/+2
| | | |
| * | | Added JS unit tests for commentsVincent Petry2016-02-024-6/+308
| | | |
| * | | Add spinner when submitting commentsVincent Petry2016-02-022-7/+32
| | | |
| * | | Fix formatting messages with newlinesVincent Petry2016-02-021-2/+11
| | | |
| * | | Better comments pagination logicVincent Petry2016-02-021-11/+9
| | | |
| * | | Improve comments style, add avatarsVincent Petry2016-02-023-22/+104
| | | |
| * | | Use last comment's time for paginationVincent Petry2016-02-021-1/+1
| | | |
| * | | Add pagination support for comments GUIVincent Petry2016-02-022-16/+45
| | | |
| * | | Improve comment date formatVincent Petry2016-02-021-3/+10
| | | |
| * | | Comments GUIVincent Petry2016-02-027-0/+406
| | | |