9d2c433b24
fix pgsql
2016-02-05 15:36:21 +01:00
d537cae063
cleanup jobs for comments and comment read marks
2016-02-05 15:36:21 +01:00
e15a120f83
Merge pull request #22152 from owncloud/activities-for-comments
...
Activities for comments
2016-02-05 13:50:38 +01:00
733db5c14a
Add a filter for comment activities
2016-02-05 11:30:53 +01:00
070ff71a2d
Add activities for comments
2016-02-05 11:30:53 +01:00
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
96ccbca2e3
Merge pull request #22135 from owncloud/global-auth-warning
...
fix warning caused by global auth
2016-02-05 10:04:22 +01:00
0ed2108b7f
[tx-robot] updated from transifex
2016-02-05 01:56:20 -05:00
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
b7d27ab141
fix warning caused by global auth
2016-02-04 16:53:13 +01:00
d83b1f3b8b
fix error code for unconfigured user provided auth
2016-02-04 16:47:41 +01:00
b12d449ec7
set read permissions on failed mount root
2016-02-04 16:41:27 +01:00
e420ae068c
handle exception in availibilty check
2016-02-04 16:33:08 +01:00
53fbaf70c0
fix input type
2016-02-04 16:33:08 +01:00
2e3a5ccaaa
show failed external storages properly
2016-02-04 16:33:08 +01:00
4b4bf87f95
Use handlebars template
2016-02-04 16:33:08 +01:00
7162d66373
Fix PR from comments
2016-02-04 16:33:08 +01:00
8fa96435b0
Add credentials dialog for user provided auth
2016-02-04 16:33:08 +01:00
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
52ce83993d
Merge pull request #22124 from owncloud/comments-author-check
...
Check for authorship on edit attempt
2016-02-04 15:16:33 +01:00
9dfe9f77f2
Add global auth backend for files external
2016-02-04 14:57:17 +01:00
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
a480b2261b
Check for authorship on edit and delete attempts
2016-02-04 12:57:48 +01:00
cd16ba5cb3
Merge pull request #22025 from owncloud/21838-jenkins
...
[jenkins] + rebased, of #21838
2016-02-04 11:58:45 +01:00
2e46576e83
Special label for deleted users in comments list
2016-02-04 11:26:11 +01:00
e64044d43e
Merge pull request #21964 from owncloud/calendar-sharing-3
...
Add calendar sharing
2016-02-04 10:48:36 +01:00
6a5b0eafa5
Merge pull request #22108 from owncloud/comments-edit
...
Comment owner can now edit or delete
2016-02-04 10:47:49 +01:00
a022584e4a
[tx-robot] updated from transifex
2016-02-04 01:55:08 -05:00
e370b601db
fix unit tests
2016-02-03 22:45:33 +01:00
cd19b648c6
change error logging
...
replaced variable with print_r call
2016-02-03 21:50:27 +01:00
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
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
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
805ba20bae
Added unit tests for edit/delete comments
2016-02-03 21:06:55 +01:00
1caee3ac2e
Move comment delete action into edit mode
2016-02-03 21:06:55 +01:00
bbefe1ed64
Comment owner can now edit or delete
2016-02-03 21:06:55 +01:00
da04620155
Merge pull request #22101 from owncloud/comments-filerow
...
Add file row indicator for unread comments
2016-02-03 20:53:40 +01:00
81b9721700
Remove entries in dav_shares on deletion of a calendar
2016-02-03 20:18:56 +01:00
453ea6698d
[Share 2.0] Fix public link sharing
2016-02-03 19:25:29 +01:00
c1841892d0
[Share 2.0] Fix OCS endpoint
2016-02-03 19:25:29 +01:00
a3cc448c9d
Adding propfind property to retrieve sharee information from a dav resource
2016-02-03 17:18:23 +01:00
8c14ce01ba
Deleting a shared address book results in unshare
2016-02-03 17:18:22 +01:00
ef06d6bdaa
Deleting a shared calendar results in unshare
2016-02-03 17:18:22 +01:00
6f933fde60
Disallow to share with the owner of the resource
2016-02-03 17:18:22 +01:00
4b14ca672f
Fix ACLs on shared calendars
2016-02-03 17:18:22 +01:00
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
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
9106595608
Add calendar sharing
2016-02-03 17:18:22 +01:00
85bec3ffcb
Reset comments read marker after loading comments
2016-02-03 16:18:14 +01:00
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
Arthur Schiwon
Thomas Müller
Joas Schilling
Jenkins for ownCloud
Vincent Petry
Robin Appelman
Jesús Macias
alexweirig
Roeland Jago Douma