wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30110 commits 157 branches 562 tags 714 MiB
Commit graph

30110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
0f22a8db1d Also add type (file/folder) to IShare object 
We need this for the hooks :(
 2016-02-04 14:28:09 +01:00
Roeland Jago Douma
2c0cb5a00e Unit test for delete lazy shares 2016-02-04 13:30:42 +01:00
Roeland Jago Douma
e0bc128eb5 Add unit tests 2016-02-04 13:05:05 +01:00
Roeland Jago Douma
fc215d0980 Make the share object lazy 
Share providers can now just pass in a fileId. And the node will only be
created once needed.
 2016-02-04 12:51:23 +01:00
Thomas Müller
cd16ba5cb3 Merge pull request #22025 from owncloud/21838-jenkins 
[jenkins] + rebased, of #21838
 2016-02-04 11:58:45 +01:00
Thomas Müller
b594aa18ee Merge pull request #22110 from owncloud/comment-types-always-plural 
types shall always be plural
 2016-02-04 10:55:49 +01:00
Thomas Müller
d3c86bdd67 Merge pull request #22103 from ErikPel/tag-css-fix 
Fixes #22097
 2016-02-04 10:49:41 +01:00
Thomas Müller
e64044d43e Merge pull request #21964 from owncloud/calendar-sharing-3 
Add calendar sharing
 2016-02-04 10:48:36 +01:00
Thomas Müller
6a5b0eafa5 Merge pull request #22108 from owncloud/comments-edit 
Comment owner can now edit or delete
 2016-02-04 10:47:49 +01:00
Thomas Müller
2c41a266c0 Merge pull request #22072 from vincchan/trim-newusername-whitespace 
Do not allow username to have whitespace at the beginning or at the end
 2016-02-04 10:33:30 +01:00
Jenkins for ownCloud
a022584e4a [tx-robot] updated from transifex 2016-02-04 01:55:08 -05:00
Arthur Schiwon
e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig
cd19b648c6 change error logging 
replaced variable with print_r call
 2016-02-03 21:50:27 +01:00
alexweirig
f4d4bed10b Fixed undefined variable $dnGroup and variable name 
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.
 2016-02-03 21:50:27 +01:00
alexweirig
39aac2c66b Refactored code to avoid performance problem 
Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl
 2016-02-03 21:50:27 +01:00
Alex Weirig
0d797637f3 code changes for user_ldap Dynamic Group Membership 
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.
 2016-02-03 21:50:27 +01:00
Vincent Petry
805ba20bae Added unit tests for edit/delete comments 2016-02-03 21:06:55 +01:00
Vincent Petry
1caee3ac2e Move comment delete action into edit mode 2016-02-03 21:06:55 +01:00
Vincent Petry
bbefe1ed64 Comment owner can now edit or delete 2016-02-03 21:06:55 +01:00
Thomas Müller
da04620155 Merge pull request #22101 from owncloud/comments-filerow 
Add file row indicator for unread comments
 2016-02-03 20:53:40 +01:00
Thomas Müller
dd2f62e3e4 Merge pull request #22088 from owncloud/share2_ishare 
[Share 2.0] Pass around userid/groupid/federatedid
 2016-02-03 20:53:25 +01:00
Thomas Müller
81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +01:00
Arthur Schiwon
9370491822 types shall always be plural 2016-02-03 19:28:15 +01:00
Roeland Jago Douma
453ea6698d [Share 2.0] Fix public link sharing 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0 [Share 2.0] Fix OCS endpoint 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
96662c4d0d [Share 2.0] Fix shareManager 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
eb904c7aa9 [Share 2.0] Fix defaultshare provider 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
78be766cf5 [Share 2.0] Use strings for ids 
* sharedWith
* sharedBy
* shareOwner

Now all set/get strings with the id. (userId, groupId,
federatedsharerId).

This to avoid a huge amount of if statements
 2016-02-03 19:25:29 +01:00
Daniel Molkentin
c0322b3f98 Merge pull request #22106 from owncloud/use-newly-generated-keys 
Use newly generated certificate authority
 2016-02-03 18:19:24 +01:00
Lukas Reschke
1d27a53338 Use newly generated certificate authority 2016-02-03 18:17:43 +01:00
Thomas Müller
a3cc448c9d Adding propfind property to retrieve sharee information from a dav resource 2016-02-03 17:18:23 +01:00
Thomas Müller
8c14ce01ba Deleting a shared address book results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
ef06d6bdaa Deleting a shared calendar results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
6f933fde60 Disallow to share with the owner of the resource 2016-02-03 17:18:22 +01:00
Thomas Müller
4b14ca672f Fix ACLs on shared calendars 2016-02-03 17:18:22 +01:00
Thomas Müller
0753067bcd No duplicate address book if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
18c35bf812 No duplicate calendars if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
9106595608 Add calendar sharing 2016-02-03 17:18:22 +01:00
Erik Pellikka
4f3cf66ba3 Fixes #22097 
Updated with more specific css selector

Moved the curly brace to the same line as the selector

firefox fix
 2016-02-03 10:38:46 -05:00
Vincent Petry
85bec3ffcb Reset comments read marker after loading comments 2016-02-03 16:18:14 +01:00
Thomas Müller
dfeb6ea491 Merge pull request #22086 from RealRancor/RealRancor-patch-1 
Remove files_locking from shipped.json
 2016-02-03 16:09:02 +01:00
Thomas Müller
e34ec0a138 Merge pull request #22095 from owncloud/public_link_with_port 
Public link downloads should work on instance on non default port
 2016-02-03 16:06:54 +01:00
Thomas Müller
ab1c79827e Merge pull request #22071 from owncloud/cache-split-insert 
split cache->insert from cache->put
 2016-02-03 14:32:28 +01:00
Thomas Müller
74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps 
Cleanup core apps
 2016-02-03 14:17:10 +01:00
Vincent Chan
cc17ac9ff9 move whitspace check to user manager 2016-02-03 14:09:15 +01:00
Thomas Müller
f2ada30888 Merge pull request #21996 from owncloud/flysystem-1.0.16 
[3rdparty] Bump flysystem to 1.0.16
 2016-02-03 13:57:09 +01:00
Thomas Müller
aaf7299d28 Merge pull request #22070 from owncloud/share2_exceptions 
Add sharing exceptions to OCP
 2016-02-03 13:36:14 +01:00
Thomas Müller
cf81574e87 Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting 
Revert "setting to skip migration tests by default"
 2016-02-03 13:03:43 +01:00
Vincent Petry
8bb1437e24 Add file row indicator for unread comments 2016-02-03 13:00:55 +01:00
Morris Jobke
0a66734416 Revert "setting to skip migration tests by default" 2016-02-03 12:59:47 +01:00