summaryrefslogtreecommitdiffstats
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 #22110 from owncloud/comment-types-always-pluralThomas Müller2016-02-047-45/+45
|\ \ | | | | | | types shall always be plural
| * | 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 #22097
| * | | Fixes #22097Erik Pellikka2016-02-031-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-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
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22072 from vincchan/trim-newusername-whitespaceThomas Müller2016-02-041-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Do not allow username to have whitespace at the beginning or at the end
| * | | | | move whitspace check to user managerVincent Chan2016-02-032-6/+4
| | | | | |
| * | | | | Do not allow username to have space at the beginning or at the endVincent Chan2016-02-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | fixes #22035
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-044-0/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #22101 from owncloud/comments-filerowThomas Müller2016-02-0313-12/+430
|\ \ \ \ \ | | | | | | | | | | | | Add file row indicator for unread comments
| * | | | | Reset comments read marker after loading commentsVincent Petry2016-02-038-11/+235
| | | | | |
| * | | | | Add file row indicator for unread commentsVincent Petry2016-02-036-1/+195
| | | | | |
* | | | | | Merge pull request #22088 from owncloud/share2_ishareThomas Müller2016-02-0313-690/+603
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | [Share 2.0] Pass around userid/groupid/federatedid
| * | | | | [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
| | | | | |
| * | | | | [Share 2.0] Fix shareManagerRoeland Jago Douma2016-02-034-233/+254
| | | | | |
| * | | | | [Share 2.0] Fix defaultshare providerRoeland Jago Douma2016-02-033-307/+169
| | | | | |
| * | | | | [Share 2.0] Use strings for idsRoeland Jago Douma2016-02-033-17/+26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sharedWith * sharedBy * shareOwner Now all set/get strings with the id. (userId, groupId, federatedsharerId). This to avoid a huge amount of if statements
* | | | | Merge pull request #22106 from owncloud/use-newly-generated-keysDaniel Molkentin2016-02-034-155/+57
|\ \ \ \ \ | |_|_|/ / |/| | | | Use newly generated certificate authority
| * | | | Use newly generated certificate authorityLukas Reschke2016-02-034-155/+57
|/ / / /
* | | | Merge pull request #22086 from RealRancor/RealRancor-patch-1Thomas Müller2016-02-031-1/+0
|\ \ \ \ | | | | | | | | | | Remove files_locking from shipped.json
| * | | | Remove files_locking from shipped.jsonRealRancor2016-02-031-1/+0
| | | | |
* | | | | Merge pull request #22095 from owncloud/public_link_with_portThomas Müller2016-02-033-12/+23
|\ \ \ \ \ | | | | | | | | | | | | Public link downloads should work on instance on non default port
| * | | | | Construct valid URLRoeland Jago Douma2016-02-032-10/+4
| | | | | |
| * | | | | host and hostname are different thingsRoeland Jago Douma2016-02-031-2/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | host can contain the port (host of http://example.com:1234 is example.com:1234) while hostname never contains a port. They can however be similar. If you navigate to http://example.com then both host and hostname will be example.com. * Fixed docs * added getHostName function
* | | | | Merge pull request #22071 from owncloud/cache-split-insertThomas Müller2016-02-034-44/+90
|\ \ \ \ \ | | | | | | | | | | | | split cache->insert from cache->put
| * | | | | split cache->insert from cache->putRobin Appelman2016-02-034-44/+90
| | | | | |
* | | | | | Merge pull request #22098 from owncloud/cleanup-core-appsThomas Müller2016-02-036-12/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Cleanup core apps
| * | | | | Make sure tests don't leave a stray directory behindJoas Schilling2016-02-031-3/+3
| | | | | |
| * | | | | Make sure encryption has a valid licence tagJoas Schilling2016-02-031-1/+1
| | | | | |
| * | | | | Remove deprecated and unused standalone tagJoas Schilling2016-02-032-2/+0
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 03:50:06 +0000