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

12489 commits

Author SHA1 Message Date
Thomas Müller
342c2aac98 Merge pull request #20920 from owncloud/issue_20888 
Add dialog to enter credentials on errored mount point
 2016-02-05 10:05:23 +01:00
Thomas Müller
96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning 
fix warning caused by global auth
 2016-02-05 10:04:22 +01:00
Jenkins for ownCloud
0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Vincent Petry
d4da2f0ac7 Improve credentials dialog usability a bit 
Automatically focus on the first field.
Pressing enter submits the form.
 2016-02-04 17:18:21 +01:00
Robin Appelman
b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman
d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman
b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman
e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman
53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00
Robin Appelman
2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Robin Appelman
4b4bf87f95 Use handlebars template 2016-02-04 16:33:08 +01:00
Jesús Macias
7162d66373 Fix PR from comments 2016-02-04 16:33:08 +01:00
Jesús Macias
8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Thomas Müller
089b60cd25 Merge pull request #22107 from owncloud/external-auth-global 
Add global auth backend for files external
 2016-02-04 16:18:23 +01:00
Thomas Müller
52ce83993d Merge pull request #22124 from owncloud/comments-author-check 
Check for authorship on edit attempt
 2016-02-04 15:16:33 +01:00
Robin Appelman
9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Thomas Müller
899444103a Merge pull request #22121 from owncloud/comments-deleteduser 
Special label for deleted users in comments list
 2016-02-04 13:03:18 +01:00
Arthur Schiwon
a480b2261b Check for authorship on edit and delete attempts 2016-02-04 12:57:48 +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
Vincent Petry
2e46576e83 Special label for deleted users in comments list 2016-02-04 11:26:11 +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
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
81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +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
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
Vincent Petry
85bec3ffcb Reset comments read marker after loading comments 2016-02-03 16:18:14 +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
74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps 
Cleanup core apps
 2016-02-03 14:17:10 +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
Vincent Petry
8bb1437e24 Add file row indicator for unread comments 2016-02-03 13:00:55 +01:00
Joas Schilling
78d5c89e86 Make sure encryption has a valid licence tag 2016-02-03 12:57:03 +01:00
Joas Schilling
d79b0886d0 Remove deprecated and unused standalone tag 2016-02-03 12:56:42 +01:00