averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,337 Commits 712 Branches 1,186 Tags
2e4cc6da17028e777dc223689f1b9964ff2a4d8f
Commit Graph

169 Commits

Author SHA1 Message Date
Sergej Pupykin
1655ba9aeb fix typo 2020-07-16 02:19:21 +03:00
Morris Jobke
7e281a07bb Use IBootstrap for the app federatedfilesharing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-14 16:34:43 +02:00
Joas Schilling
41d1d6d20e Move federatedfilesharing to migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-07-06 16:42:14 +02:00
Morris Jobke
3333c885c0 Merge pull request #21264 from stweil/master 
build: Fix some typos (most of them found by codespell)
 2020-07-05 22:52:28 +02:00
Joas Schilling
89ed2c37bf Update share type constant usage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-06-24 16:49:16 +02:00
Stefan Weil
e8af52001e build: Fix some typos (most of them found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2020-06-06 13:03:00 +02:00
Joas Schilling
bdf0e8d3d4 Fix PSR-4 namespace 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-06-05 15:11:57 +02:00
Christoph Wurst
cb057829f7 Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Julius Härtl
45c3ee7f36 Set proper share type when converting link shares to federated shares 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-04-21 14:35:28 +02:00
Christoph Wurst
28f8eb5dba Add visibility to all constants 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 16:54:27 +02:00
Christoph Wurst
caff1023ea Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
14c996d982 Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Christoph Wurst
44577e4345 Remove trailing and in between spaces 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:07:47 +02:00
Christoph Wurst
afbd9c4e6e Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
41b5e5923a Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
2fbad1ed72 Fix (array) indent style to always use one tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 10:16:08 +02:00
Christoph Wurst
1a9330cd69 Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
463b388589 Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports 
Remove unused imports
 2020-03-27 17:14:08 +01:00
Christoph Wurst
b80ebc9674 Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst
74936c49ea Remove unused imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:08:08 +01:00
Georg Ehrke
789719da90 Default value of lookupServerEnabled should be the same everywhere 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-03-17 10:41:19 +01:00
Roeland Jago Douma
e0715d704e Use proper andwhere clause 
Fixes #19248

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-03 12:17: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
Christoph Wurst
1b46621cd3 Update license headers for 18 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-20 09:23:25 +01:00
Maxence Lange
3513833ccd confirm auth on share generated by Circles 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
returns true

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
DI

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
DI

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-16 11:01:02 -01:00
John Molakvoæ
3a563fdfd7 revert protected 2019-12-06 16:10:30 +01:00
John Molakvoæ (skjnldsv)
ab2b3d2755 Fix external sharing loading script 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-12-06 16:10:30 +01:00
Christoph Wurst
5bf3d1bb38 Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Roeland Jago Douma
68748d4f85 Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Roeland Jago Douma
5195be108f Merge pull request #17985 from nextcloud/enh/use_displayname_federated_share 
Use the displayname for federated notifications
 2019-11-18 20:22:31 +01:00
Roeland Jago Douma
17fae47bdb Use the displayname for federated notifications 
Since we have the showing this is a lot nicer.
Especially on alrge isntances where the uid can be totally random.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 15:00:33 +01:00
Joas Schilling
e96c9e0e4a Add the notifier and the API endpoint for user shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-12 17:33:50 +01:00
Roeland Jago Douma
8085ca4cc4 Get all shares as iterable 
Sometimes we need all shares or rather a specific subset of shares but
creating dedicated functions is a pain. This just returns an iterable
object for all shares so we can loop over them without allocating all
the memory on the system.

It should not be used by any user called code. But in an occ command or
background job it is fine IMO.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 09:45:27 +01:00
Roeland Jago Douma
22f6960f83 Allow removing federated shares of locally reshared files 
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-03 15:21:04 +02:00
Joas Schilling
44bc697a93 Update Federated sharing notifier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-15 15:12:43 +02:00
Morris Jobke
db4e8d67e0 Show share settings only if incoming federated shares are allowed 
Fixes #15802

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-05-31 17:38:45 +02:00
Julius Härtl
8f11d2a39b Only show sharing section if it has content 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-05-20 18:07:24 +02:00
Jos Poortvliet
b3cdc317e0 update URL for federation 2018-12-27 13:12:23 +01:00
Julius Härtl
4dda244ce2 Fix logo path in personal federated sharing settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:18:39 +01:00
Joas Schilling
ea21aa3f7a Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +02:00
Bjoern Schiessle
1d5a9c3f97 handle unshare request from owner 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:47 +02:00
Bjoern Schiessle
f5a816262c accept/decline group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:46 +02:00
Bjoern Schiessle
7a48a85dca fix notification when a group share is received 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:45 +02:00
Bjoern Schiessle
b23032e4c5 implement federated group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Bjoern Schiessle
c8631d607e add setting to enable/disable federated group sharing 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:41 +02:00
Roeland Jago Douma
d805959e81 Add API to undelete delete group shares 
When a group share is deleted we keep track of this in the DB.
Right now it is only possible for a recipient to get back the share by
asking the sharer to delete it and to share it again. This doesn't
scale.

This endpoint makes it possible to get back the share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:56 +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
086e7a0aa2 remove debug output 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
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