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

44507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
3d5acbb1d0
prevent lock values from going negative with memcache backend 
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-05 14:39:10 +02:00
blizzz
42912a0e25
Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-format 
LDAP user should be able to set avatar if directory provides incompatible image
 2018-07-04 14:37:21 +02:00
Morris Jobke
4051a23305
Merge pull request #10102 from nextcloud/bugfix/noid/fix-integration-tests-federation-2.0 
Fix integration tests for Federation 2.0
 2018-07-04 11:59:19 +02:00
Morris Jobke
021bd261bc
Fix integration tests for Federation 2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-04 11:23:39 +02:00
Morris Jobke
16d5883680
Merge pull request #10101 from nextcloud/papercut/10094/oauth_table 
Do not show OAuth2 table if it is empty
 2018-07-04 11:22:56 +02:00
Roeland Jago Douma
c92fe76f77
Merge pull request #10065 from nextcloud/rakekniven-patch-1 
Update SettingsController.php
 2018-07-04 08:26:27 +02:00
Roeland Jago Douma
ba08019429
Do not show OAuth2 table if it is empty 
For #10094

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-04 08:23:21 +02:00
Morris Jobke
7025f16017
Merge pull request #9345 from nextcloud/federation20 
Federation 2.0
 2018-07-03 23:13:47 +02:00
Roeland Jago Douma
8b683feca2
Merge pull request #10088 from nextcloud/bugfix/noid/rebuild-navigation-first 
Properly insert app icons into navigation
 2018-07-03 20:09:29 +02:00
Roeland Jago Douma
df84c3c421
Merge pull request #10090 from nextcloud/smb-log-connection-errors 
Improved logging of smb connection errors
 2018-07-03 17:55:46 +02:00
Morris Jobke
e97191e1de
Merge pull request #10092 from nextcloud/revert/10080/undeclared-phan-warning 
Revert "Fix undeclared method warning in phan"
 2018-07-03 17:55:24 +02:00
Morris Jobke
10b8a4a8b1
Revert "Fix undeclared method warning in phan" 
This reverts commit f3093b2401.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-03 17:46:11 +02:00
Robin Appelman
27089422e1
Improved logging of smb connection errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-03 14:56:37 +02:00
Julius Härtl
7b87e00db1
Properly insert app icons into navigation 
If the app menu is rebuild with the first icon being updated, the whole
list was empty, therefore we need a fallback to properly insert the
element then.

Fixes https://github.com/nextcloud/dashboard/issues/10

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-03 12:14:39 +02:00
Arthur Schiwon
a4dda465c2
let user set avatar in nextcloud von LDAP provides invalid image data 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-07-03 01:45:07 +02:00
Arthur Schiwon
552da85df8
Iron User_LDAP tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-07-03 00:29:34 +02:00
Morris Jobke
aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning 
Fix undeclared method warning in phan
 2018-07-02 17:40:39 +02:00
Morris Jobke
48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash 
fix double slash in search result path when the result is in a submount
 2018-07-02 15:49:27 +02:00
Morris Jobke
6e9dbe7d15
Merge pull request #10078 from nextcloud/bugfix/activity-277/invalid-actor-and-calendar-for-link-shares 
Correctly parse the subject parameters for link (un)shares of calendars
 2018-07-02 15:43:36 +02:00
Morris Jobke
f3093b2401
Fix undeclared method warning in phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-02 15:38:49 +02:00
Morris Jobke
fe807823d2
Merge pull request #10077 from nextcloud/lazy-search-fix 
Fix lazy search backend
 2018-07-02 15:37:29 +02:00
Robin Appelman
922c851494
fix double slash in search result path when the result is in a submount 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-02 14:17:38 +02:00
Joas Schilling
a0a6aff772
Correctly parse the subject parameters for link (un)shares of calendars 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-02 13:57:48 +02:00
Robin Appelman
1f9f5e2e5e
Fix lazy search backend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-02 13:42:41 +02:00
Bjoern Schiessle
7ff74ae8ed
cache results from ocm end-point discovery 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
ce567b6121
remove unused code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
411bae5163
fix return type from send share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Bjoern Schiessle
511a34b08f
always enable cloud federation api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 12:43:43 +02:00
Morris Jobke
6142cd6fb4
Merge pull request #10070 from weeman1337/bug9949-2 
Updates the maintenance command output
 2018-07-02 12:21:11 +02:00
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
086e7a0aa2
remove debug output 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
cfb3e80d1b
remove the makefile 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
8d4da30bf5
add support for different share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
e251b34a8c
cleanup variable naming, it is actually a resource type 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
5c8b26248b
let the actual federated share provider check if incoming/outgoing shares are enabled for the specific resource type 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
22d9246134
send the display name back after a federated share was received 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
27814127dd
make sure that remote url gets stored with a trailing '/' 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
21b8a873d5
implement config check 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
9365fd2534
fix external manager tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
2e19213695
fix notification tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
9d145bb5dd
update tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00
Bjoern Schiessle
5d0d33a0d4
remove unused method 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
34c4527cc4
add ocm-provider to the list of expected files 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
84fc188dfc
some minor fixes and clode cleanup 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
61485e3e60
fix check for reshare permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
ed415726d3
send RESHARE_CHANGE_PERMISSION message 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
2bb1956c1f
implement RESHARE_UNDO notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications 
- Don't send message to owner/sharer about revoked re-shares twice.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:29 +02:00
Bjoern Schiessle
a176a1f318
implement unshare notification 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00