upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-20 09:12:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
47885 commits 998 branches 1208 tags 8.5 GiB
Commit graph

47885 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
5ba848a3ed
Merge pull request #16219 from nextcloud/version/noid/15.0.9 
15.0.9
 2019-07-04 08:47:39 +02:00
Nextcloud bot
5b1e5f26d5
[tx-robot] updated from transifex 2019-07-04 02:14:02 +00:00
Morris Jobke
8681acc5e6
15.0.9 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-03 23:29:30 +02:00
Morris Jobke
bbd4007753
Merge pull request #16215 from nextcloud/backport/16186/stable15 
[stable15] Better check reshare permissions part2
 2019-07-03 23:29:09 +02:00
Roeland Jago Douma
0237578aa0
Merge pull request #16212 from nextcloud/backport/notfications/stable15 
[stable15] Fix notification casting
 2019-07-03 21:48:46 +02:00
Joas Schilling
f3ad4636fc
Remove duplicate tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:31:47 +02:00
Joas Schilling
132902337e
Unify the permission checking in one place only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:31:40 +02:00
Joas Schilling
029ecb7966
Better check reshare permissions when creating a share 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-03 21:29:31 +02:00
Roeland Jago Douma
32c072853f
Fix notification casting 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-03 20:32:45 +02:00
Morris Jobke
e5412ea49e
Merge pull request #16202 from nextcloud/backport/16199/stable15 
[stable15] RefreshWebcalJob: replace ugly Regex with standard php utils
 2019-07-03 09:59:48 +02:00
Nextcloud bot
9858b42cd0
[tx-robot] updated from transifex 2019-07-03 02:13:57 +00:00
Georg Ehrke
9e6c3c0773 RefreshWebcalJob: replace ugly Regex with standard php utils 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-07-02 21:03:58 +00:00
Nextcloud bot
d851e4daa1
[tx-robot] updated from transifex 2019-07-02 02:13:55 +00:00
Nextcloud bot
d57a283464
[tx-robot] updated from transifex 2019-07-01 02:13:47 +00:00
Nextcloud bot
2da47e308c
[tx-robot] updated from transifex 2019-06-30 02:14:21 +00:00
Roeland Jago Douma
4012def9e0
Merge pull request #16063 from nextcloud/version/15.0.9/RC1 
15.0.9 RC1
 2019-06-29 07:19:43 +02:00
Nextcloud bot
a525255c23
[tx-robot] updated from transifex 2019-06-29 02:13:45 +00:00
Roeland Jago Douma
0938255320
15.0.9 RC1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-28 15:45:46 +02:00
Roeland Jago Douma
53844c8916
Merge pull request #16142 from nextcloud/backport/16097/stable15 
[stable15] Better check reshare permissions
 2019-06-28 15:39:30 +02:00
Roeland Jago Douma
7dcd2a808c
Fix sharing tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-06-28 10:00:10 +02:00
Daniel Calviño Sánchez
9f6b9b44df
Add integration test for increasing sub reshare permissions 
The tests check an user share and a link share; there is a slight
difference in style between them as each one is based on the test above
it, which tests increasing reshare permissions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-28 09:49:26 +02:00
Daniel Calviño Sánchez
d3301befa0
Do not create folders with admin user 
The admin user is not deleted after each integration test is run, so
folders created by the admin user in one test are still there when the
next tests run; tests should be independent one from each other, so a
regular user that is created and deleted for each test should be used
instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-28 09:49:11 +02:00
Joas Schilling
38fe009444
Correctly check share permissions when updating a re-sub-share 
Before this change the node you shared was checked for permissions.
This works when you reshare the folder that was shared with you.
However when you reshared a subfolder (e.g. as public link),
you could afterwards update the permissions and grant
create+update permissions although the share you receive was read-only.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-28 09:48:59 +02:00
Roeland Jago Douma
fd64f47eee
Merge pull request #16134 from nextcloud/backport/16121/stable15 
[stable15] Don't allow to disable encryption via the API
 2019-06-28 09:45:27 +02:00
Nextcloud bot
c272bee833
[tx-robot] updated from transifex 2019-06-28 02:14:00 +00:00
Joas Schilling
0be423ae67 Don't allow to disable encryption via the API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-27 20:20:14 +00:00
Roeland Jago Douma
1697f3472e
Merge pull request #16126 from nextcloud/backport/16114/stable15 
[stable15] Fix download link included in public share page with hidden download
 2019-06-27 22:13:54 +02:00
Roeland Jago Douma
843fcef3fd
Merge pull request #16129 from nextcloud/backport/16107/stable15 
[stable15] verify that paths are valid for recursive local move
 2019-06-27 22:12:33 +02:00
Robin Appelman
cdc97ec9c3 verify that paths are valid for recursive local move 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-06-27 14:39:32 +00:00
Daniel Calviño Sánchez
8133ca056c Fix download link included in public share page with hidden download 
The preview element in the public share page was always wrapped with a
link to download the file; now that link is included only if the "Hide
download" option of the share is not enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-06-27 14:30:28 +00:00
Roeland Jago Douma
ac486b003b
Merge pull request #16113 from nextcloud/backport/16101/stable15 
[stable15] invalidates user when plugin reported deletion success
 2019-06-27 16:10:32 +02:00
Roeland Jago Douma
e4d88bd47d
Merge pull request #16110 from nextcloud/backport/stable15/16011 
[stable15] (LDAP) API: return one base properly when multiple are configured
 2019-06-27 16:10:21 +02:00
Arthur Schiwon
a9c2a4285c Also invalidate groups after deletion 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-27 10:22:33 +00:00
Arthur Schiwon
8d5a4bc0c4 invalidates user when plugin reported deletion success 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-27 10:22:32 +00:00
Arthur Schiwon
69544e69e4
fixes return type in php doc 
* the backend already expects and works with the string

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-27 11:36:01 +02:00
Arthur Schiwon
d1ead1dfd2
fixes returning the base when multiple are specified 
* reading the config directly will return the value with line breaks
* using the proper accessor gives us all bases in an array
* returns the first matching one
* having user id provided for the group base is strange and does not let
  us operate like this. here we return the first one. might change in
  future, a backportable fix won't have an API change however.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-06-27 11:35:47 +02:00
Nextcloud bot
3c06d861b6
[tx-robot] updated from transifex 2019-06-27 02:14:23 +00:00
Roeland Jago Douma
b14e0b028d
Merge pull request #16092 from nextcloud/backport/16027/stable15 
[stable15] Check if uploading to lookup server is enabled before verifying
 2019-06-26 18:37:56 +02:00
Roeland Jago Douma
f63a2bfd97
Merge pull request #16083 from nextcloud/backport/15832/stable15 
[stable15] Fix full text search for groupfolders
 2019-06-26 15:48:57 +02:00
Roeland Jago Douma
8d6625f5e8
Merge pull request #16090 from nextcloud/backport/16021/stable15 
[stable15] Fall back to black for non-color values
 2019-06-26 13:42:17 +02:00
Joas Schilling
d0123a1b51 Check if uploading to lookup server is enabled before verifying 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-26 08:19:04 +00:00
Joas Schilling
fdc532f753 Fall back to black for non-color values 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-06-26 08:18:31 +00:00
Roeland Jago Douma
e339ed7f6e
Merge pull request #16081 from nextcloud/backport/15956/stable15 
[stable15] Fix appid argument for integrity:check-app
 2019-06-26 09:59:28 +02:00
Nextcloud bot
a20a77f9af
[tx-robot] updated from transifex 2019-06-26 02:14:12 +00:00
Roeland Jago Douma
b8f94a9414
Merge pull request #15927 from nextcloud/backport/stable15/15830 
[stable15] Show share settings only if incoming federated shares are allowed
 2019-06-25 21:49:52 +02:00
Morris Jobke
9ad616e221 Fix full text search for groupfolders 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-06-25 19:46:25 +00:00
Georg Ehrke
dfc52cd68d Fix appid argument for integrity:check-app 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-06-25 19:37:57 +00:00
Roeland Jago Douma
2309561198
Merge pull request #16030 from nextcloud/backport/15540/stable15 
[stable15] Prevent faulty logs from nested setupFS calls
 2019-06-25 13:33:53 +02:00
Nextcloud bot
8ff48bb3ec
[tx-robot] updated from transifex 2019-06-25 02:14:18 +00:00
blizzz
76e693084b
Merge pull request #16052 from nextcloud/backport/16033/stable15 
[stable15] fix LDAP Wizard forgetting groups on select with search
 2019-06-24 16:18:37 +02:00