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

1119 commits

Author SHA1 Message Date
Morris Jobke
4b49e2eb52
Fix unnecessary boolean cast 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 10:12:58 +01:00
Morris Jobke
fde4c54136
Merge pull request #13790 from fretn/master 
Fix for crashing occ files:scan
 2019-03-06 10:12:14 +01:00
Christoph Wurst
e930a0ccbe
Search sharees on lookup server when explicitly requested by user 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-26 19:44:49 +01:00
Morris Jobke
ee68e8f47e
Merge pull request #13514 from nextcloud/fix-public-grid-toggle 
Fix grid toggle button on public page
 2019-02-25 21:18:42 +01:00
Christoph Wurst
f3023aaa85
Show sharing recommendations 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-02-25 07:25:21 +01:00
John Molakvoæ (skjnldsv)
ee2c45d60d
Fix grid toggle button on public page 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-02-21 09:17:57 +01:00
Julius Härtl
2ec5e2b588
Fix writable public folder share 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-02-19 10:18:26 +01:00
Roeland Jago Douma
0e72d38747
Catch Request exception in testRemoteUrl 
Else the background job fails hard if the remote has for example an
invalid certificate.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-15 23:06:21 +01:00
Jonas Sulzer
3a5d634ccc
add myself as @author 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:01 +01:00
Jonas Sulzer
e2ec22c43d
code styling 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
5756d96ab9
restructure code 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:39:00 +01:00
Jonas Sulzer
30d4024d9d
only show "Add to your Nextcloud" on share link if federation is activated 
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2019-01-31 22:38:31 +01:00
fretn
7efcd11b8e Fix for crashing occ files:scan 
when $share === false then (int)$share['share_type'] will always be equal to (int)0

which results in following crash:

[root@server nextcloud] sudo -u apache php occ files:scan someuser
The current PHP memory limit is below the recommended value of 512MB.
Starting scan for user 1 out of 1 (someuser)
An unhandled exception has been thrown:
TypeError: Argument 1 passed to OC\OCS\DiscoveryService::discover() must be of the type string, null given, called in /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php on line 382 and defined in /var/www/html/nextcloud/lib/private/OCS/DiscoveryService.php:65
Stack trace:
0 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(382): OC\OCS\DiscoveryService->discover(NULL, 'FEDERATED_SHARI...')
1 /var/www/html/nextcloud/apps/files_sharing/lib/External/Manager.php(527): OCA\Files_Sharing\External\Manager->sendFeedbackToRemote(NULL, NULL, NULL, 'decline')
2 /var/www/html/nextcloud/apps/files_sharing/lib/External/Storage.php(216): OCA\Files_Sharing\External\Manager->removeShare('files/Someth...')
3 [internal function]: OCA\Files_Sharing\External\Storage->checkStorageAvailability()
4 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array)
5 [internal function]: OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array)
6 /var/www/html/nextcloud/lib/private/Files/Storage/Wrapper/Wrapper.php(505): call_user_func_array(Array, Array)
7 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(89): OC\Files\Storage\Wrapper\Wrapper->__call('checkStorageAva...', Array)
8 /var/www/html/nextcloud/apps/files_sharing/lib/External/Scanner.php(44): OCA\Files_Sharing\External\Scanner->scanAll()
9 /var/www/html/nextcloud/lib/private/Files/Utils/Scanner.php(245): OCA\Files_Sharing\External\Scanner->scan('', true, 3)
10 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(172): OC\Files\Utils\Scanner->scan('/someuser', true, NULL)
11 /var/www/html/nextcloud/apps/files/lib/Command/Scan.php(249): OCA\Files\Command\Scan->scanFiles('someuser', '/someuser', false, Object(Symfony\Component\Console\Output\ConsoleOutput), false, true, false)
12 /var/www/html/nextcloud/3rdparty/symfony/console/Command/Command.php(251): OCA\Files\Command\Scan->execute(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
13 /var/www/html/nextcloud/core/Command/Base.php(162): Symfony\Component\Console\Command\Command->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
14 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(946): OC\Core\Command\Base->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
15 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(248): Symfony\Component\Console\Application->doRunCommand(Object(OCA\Files\Command\Scan), Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
16 /var/www/html/nextcloud/3rdparty/symfony/console/Application.php(148): Symfony\Component\Console\Application->doRun(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
17 /var/www/html/nextcloud/lib/private/Console/Application.php(213): Symfony\Component\Console\Application->run(Object(Symfony\Component\Console\Input\ArgvInput), Object(Symfony\Component\Console\Output\ConsoleOutput))
18 /var/www/html/nextcloud/console.php(96): OC\Console\Application->run()
19 /var/www/html/nextcloud/occ(11): require_once('/var/www/html/n...')
20 {main}[root@server nextcloud]

Signed-off-by: fretn <frederikdelaere+github@gmail.com>
 2019-01-24 11:45:53 +01:00
Julius Härtl
3828283c01
Add caching headers for public previews 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-02 22:27:46 +01:00
Joas Schilling
ee545d6840
Fix typo in "incoming" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-05 11:27:38 +01:00
Morris Jobke
d8314b102e
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects 
Validate all rich objects
 2018-12-04 22:48:54 +01:00
Morris Jobke
cae600d205
Merge pull request #12628 from nextcloud/bugfix/act-317/missing-activity-for-user-self-unshare 
Parse activity when a user self-unshares a file
 2018-11-30 10:14:26 +01:00
Robin Appelman
2c1f6331a4
Add interface to allow storages from opting out of encryption 
As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:31:34 +01:00
Bjoern Schiessle
1518671ad8
add capabilities for multiple share links 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-26 14:44:59 +01:00
Joas Schilling
72f8a58f89
Parse activity when a user self-unshares a file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 13:21:52 +01:00
Joas Schilling
99bcc1363e
Fix wrong used type 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 12:39:02 +01:00
Roeland Jago Douma
a343a60a68
Handle permission in update of share better 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:42:01 +01:00
John Molakvoæ (skjnldsv)
1deda8fd65
Rollback to default list view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-15 20:29:10 +01:00
Morris Jobke
79681ef3d9
Merge pull request #12398 from nextcloud/fix/12378 
change "Download" to "Download all files" for shared folders
 2018-11-13 17:21:09 +01:00
Jonas Sulzer
1f237c7e25
change "Download" to "Download all files" for shared folders 
fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
 2018-11-10 19:10:31 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Morris Jobke
7940a79a41
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares 
Add "password" parameter to the response data of link shares
 2018-11-07 16:29:05 +01:00
Morris Jobke
9669d451e3
Reduce function calls 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-07 10:19:20 +01:00
Michael Weimann
c572c669e5
Adapts the code to the new master state 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:20 +01:00
Michael Weimann
95a19bdfdd
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
08e681b221
Inlines the share note for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Michael Weimann
16f379b974
Hides the header actions for file drops 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-11-07 10:19:19 +01:00
Daniel Calviño Sánchez
b2cc2d6023 Add "password" parameter to the response data of link shares 
Due to legacy reasons the password of link shares was returned in the
"share_with" and "share_with_displayname" parameters of the response
data. Now a proper "password" parameter is returned too; the old
"share_with" and "share_with_displayname" parameters are kept, although
deprecated, and they will be removed in a future version of Nextcloud.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-06 23:48:28 +01:00
John Molakvoæ (skjnldsv)
5682d302c7
Add grid toggle for every files view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-06 11:42:18 +01:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
Roeland Jago Douma
72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares 
Shares are displayed to users with resharing rights
 2018-11-04 21:08:11 +01:00
Roeland Jago Douma
c8cf986527
Fix files_sharing 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Maxence Lange
0fc8a0f58e
user can have his resharing rights revoked, yet seeing created shares 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:49 +01:00
Maxence Lange
236a293f6a
check parents resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:10:48 +01:00
Maxence Lange
275cea5d9c
limit to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
72ad2d60b5
display shares to circles moderator 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:28 +01:00
Maxence Lange
68c44bb642
shares are displayed to users with resharing rights 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-11-02 12:09:26 +01:00
Daniel Calviño Sánchez
adf80aa8b3 Add sending the password by Talk for a link share to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Bjoern Schiessle
5e90711600 allow to update lables for public link shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:18:55 +01:00
Bjoern Schiessle
f377a61f90 allow to add labels to shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-11-01 02:15:07 +01:00
Bjoern Schiessle
d0411b2369
allow to create multiple link shares via share api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-31 06:55:52 +01:00
Daniel Calviño Sánchez
bfb2a914d2 Honour "hide download" in the public share page 
When the "hide download" property of a share is set the public share
page will not show the download button nor the menu with the download,
direct link and "Add to your Nextcloud" actions; the "downloadURL"
hidden field will not be included either in the generated HTML.

Despite that, note that the "downloadURL" parameter is still set and
passed to the template, as this could be needed anyway to generate
previews (for example, of audio files).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
c237a3f003 Expose hide download to public page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
Roeland Jago Douma
abbb946bbb Propegate hide download state in share provider 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 15:18:55 +01:00
John Molakvoæ (skjnldsv)
b6981dcecb
Merge branch 'master' of https://github.com/nextcloud/server into gridview-table 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 16:44:20 +02:00