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

52278 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
8899162463
Merge pull request #18740 from nextcloud/fix/noid/ldap-better-cache-group-existency 
cache group existence early to save useless requests to LDAP
 2020-01-08 14:22:04 +01:00
Roeland Jago Douma
7e95c88c5f
Merge pull request #18733 from exner104/patch-1 
Wrong email sender fix #18730
 2020-01-08 13:02:05 +01:00
Roeland Jago Douma
c08a949881
Merge pull request #18739 from nextcloud/fix/18712/do-not-check-inherited-shares-on-current-node 
[inherited shares] do not retrieve shares on current folder
 2020-01-08 12:59:38 +01:00
Roeland Jago Douma
eaf26fed9a
Merge pull request #18736 from nextcloud/bugfix/18708 
Fix folder permission styling
 2020-01-08 12:29:12 +01:00
Arthur Schiwon
79667b58a9
cache group existence early to save useless requests to LDAP 
we do it for users already

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-08 11:02:37 +01:00
Maxence Lange
554c4a7cf8 moving ->getParent earlier 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-08 08:56:14 -01:00
Christoph Wurst
60d4b45e89
Clean up 2FA provider registry when a user is deleted 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-08 10:51:44 +01:00
exner104
5c517baf98
additional fix to #18730 #18733 
regarding to advice from @kesselb
 2020-01-08 10:40:52 +01:00
Julius Härtl
c4cfd70b6f
Fix folder permission styling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-01-08 10:09:02 +01:00
exner104
44eba5cdc6
Wrong email sender fix #18730 
Wrong email sender in app sharebymail when sending password to owner fix #18730
 2020-01-08 09:47:55 +01:00
Arthur Schiwon
f657ded6ec
remove superfluous tests 
- user_ldap is not exposed to public api, it is always behind ldap_proxy
- this is too much for a unit test
- integration tests cover userExists implicitly

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-08 09:21:22 +01:00
Arthur Schiwon
1068b860ff
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-08 09:21:22 +01:00
Arthur Schiwon
5cae135b94
decouple userExists from userExistsOnLDAP check 
allows to mark users as offline right away, avoids a gap of being not a
user and causing weird side effects

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-08 09:21:22 +01:00
Arthur Schiwon
411a47cadb
relax strict getHome behaviour for LDAP users in a shadow state 
* simplifies deletion process
* less strange behaviour when looking up home storage (as long as it is local)
* thus could enable transfer ownerships after user went invisible on ldap

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-01-08 09:21:21 +01:00
Roeland Jago Douma
69ae7abe72
Merge pull request #18713 from nextcloud/fix/noid/do-remove-shares-generated-from-circles 
remove non-circles-generated federated shares only
 2020-01-08 09:11:27 +01:00
Roeland Jago Douma
ada25ab461
Merge pull request #18728 from simonspa/trashbin_exception 
Trash bin: fix exception triggered if no correct fileId is provided.
 2020-01-08 09:11:02 +01:00
Nextcloud bot
e645c5d96a
[tx-robot] updated from transifex 2020-01-08 02:28:20 +00:00
simonspa
b3ad27f7db Trash bin: fix exception triggered if no correct fileId is provided. 
This fixes #17115

Signed-off-by: Simon Spannagel <simon.spannagel@cern.ch>
 2020-01-07 23:47:07 +01:00
Marius David Wieschollek
bf94acfee7
[#18661] Always include custom login image in theming 
Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
 2020-01-07 22:27:20 +01:00
Roeland Jago Douma
86bccde9c7
Merge pull request #17861 from nextcloud/fix-tab-navigation-of-menu-in-public-share-pages 
Fix tab navigation of menu in public share pages
 2020-01-07 21:00:00 +01:00
Roeland Jago Douma
dd0979c651
Merge pull request #18724 from nextcloud/fix/18721/encode-uri-for-sidebar 
Encode URI for file sidebar
 2020-01-07 20:57:30 +01:00
Roeland Jago Douma
4d1f710dc9
Merge pull request #18707 from nextcloud/enh/pending_shares_overview 
A pending shares overview
 2020-01-07 20:54:58 +01:00
Julius Härtl
445274cf93
Add pending share list to frontend 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 19:35:45 +01:00
Roeland Jago Douma
782901ec96
Merge pull request #18710 from nextcloud/dependachristoph/composer/id3parser-0.1.1 
Update ID3Parser to v1.1.0 for php7.4 compat
 2020-01-07 19:27:26 +01:00
Roeland Jago Douma
951bb99e61
Merge pull request #18718 from nextcloud/fix/18711/others_with_access_only_with_reshare 
Only show others with access if you have reshare permissions
 2020-01-07 19:26:05 +01:00
Gary Kim
409d25ebf3
Encode URI for file sidebar 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-01-08 00:08:45 +08:00
Roeland Jago Douma
d99bcf1f8b
Only show others with access if you have reshare permissions 
Fixes #18711

If you do not have reshare permissions the others with access will throw
an error anyways. So better to just not show it ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 16:15:40 +01:00
Christoph Wurst
3d53e621ba
Update ID3Parser to v1.1.0 for php7.4 compat 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-07 16:02:49 +01:00
Christoph Wurst
4defd0419a
Merge pull request #18576 from BernieO/bernieo-convertInteractive 
enable option '--no-interaction' for db:convert-type
 2020-01-07 15:54:06 +01:00
Roeland Jago Douma
52e4ecd66e
Merge pull request #18644 from nextcloud/harden/csrf_endpoint 
Only allow requesting new CSRF tokens if it passes the SameSite Cooki…
 2020-01-07 13:43:46 +01:00
Maxence Lange
fc54df81d0 remove non-circles-generated shares only 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-07 09:40:41 -01:00
Roeland Jago Douma
33039a4c97
Merge pull request #18701 from nextcloud/fix/18632/show_info_when_no_others_with_access_found 
Show message if no other users with access are found
 2020-01-07 10:27:26 +01:00
blizzz
55fd157f15
Merge pull request #18535 from nextcloud/enh/flow/newDispatcher 
Use the new Events in Flow
 2020-01-07 09:58:40 +01:00
Roeland Jago Douma
fbed6a3416
A pending shares overview 
Now that we accept shares we should show an overview of shares that are
pending. This first part is the small API to get a list of the currently
pending shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 08:53:33 +01:00
Nextcloud bot
1b8f816170
[tx-robot] updated from transifex 2020-01-07 02:28:34 +00:00
Roeland Jago Douma
1fc39196bf
Show message if no other users with access are found 
Fixes #18632
Show a small subtitle if no other users with access are found.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 21:45:38 +01:00
Roeland Jago Douma
4c841559e1
Merge pull request #18692 from nextcloud/wiswedel/wording/login 
fix wording log in vs. login
 2020-01-06 20:02:52 +01:00
Roeland Jago Douma
7dfdf2c0a9
Merge pull request #18696 from nextcloud/fix/18380/auto_accept_on_mail_open 
Accept shares when you open mail
 2020-01-06 20:02:20 +01:00
Roeland Jago Douma
fb6b84b5c9
Accept shares when you open mail 
Fixes #18380

When you open a direct share to yourself. We should autoaccept the
share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 16:48:21 +01:00
Sascha Wiswedel
e24c7a8900
fix wording log in vs. login 
"log in" is used as verb, while "login" is a noun.
In this case, what's supposed to be cancelled is the login process - therefore the noun must be used.

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2020-01-06 14:44:31 +01:00
John Molakvoæ
e5d3efb99e
fix overlapping (#18473) 
fix overlapping
 2020-01-06 13:55:29 +01:00
Roeland Jago Douma
ad699682cb
Merge pull request #18672 from nextcloud/fix/17799/if_disabled_dont_show_link_shares 
Don't show link shares in sidebar if disabled
 2020-01-06 12:53:48 +01:00
Roeland Jago Douma
d4ce8c9427
Don't show link shares in sidebar if disabled 
Fixes #17799

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 12:23:06 +01:00
Roeland Jago Douma
d4d44c8fa1
Merge pull request #18675 from nextcloud/fix/17774/no_email_suggestions_when_linkshare_disabled 
Do not show e-mail suggestions if link shares are disabled
 2020-01-06 12:15:50 +01:00
Roeland Jago Douma
9a8b361911
Do not show e-mail suggestions if link shares are disabled 
For #17774

This removes the e-mail suggestions from the share input if link shares
are disabled. As e-mail shares use just link shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 10:22:22 +01:00
Roeland Jago Douma
a7b3ed32ad
Merge pull request #18687 from nextcloud/td/phpunit8/loggerTest 
Fix the LoggerTests for phpunit
 2020-01-06 10:20:01 +01:00
John Molakvoæ
0e3392665f
[#18645] Have custom login images cover the whole page (#18660) 
[#18645] Have custom login images cover the whole page
 2020-01-06 10:19:19 +01:00
Roeland Jago Douma
a673c597ed
Fix the LoggerTests for phpunit 
Less deprecation warnings. YAY.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 09:06:52 +01:00
Roeland Jago Douma
03cdff0da4
Merge pull request #18674 from nextcloud/enh/no_global_GET 
Do not use $_GET
 2020-01-06 08:06:27 +01:00
Nextcloud bot
32f79c9f0c
[tx-robot] updated from transifex 2020-01-06 02:27:21 +00:00