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

47839 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Morris Jobke
a374f764f8
Merge pull request #13784 from nextcloud/dependabot/npm_and_yarn/blueimp-md5-2.10.0 
Bump blueimp-md5 from 2.7.0 to 2.10.0
 2019-01-24 11:01:53 +01:00
Roeland Jago Douma
3c6d3ae5e0
Merge pull request #13775 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.29.0 
Bump webpack from 4.28.4 to 4.29.0 in /apps/oauth2
 2019-01-24 08:50:48 +01:00
Roeland Jago Douma
fc0e282ac5
Merge pull request #13774 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.6.0 
Bump vue-loader from 15.5.1 to 15.6.0 in /apps/oauth2
 2019-01-24 08:50:27 +01:00
dependabot[bot]
3872fbfe45
Bump blueimp-md5 from 2.7.0 to 2.10.0 
Bumps [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) from 2.7.0 to 2.10.0.
- [Release notes](https://github.com/blueimp/JavaScript-MD5/releases)
- [Commits](https://github.com/blueimp/JavaScript-MD5/compare/v2.7.0...v2.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 07:33:46 +00:00
Roeland Jago Douma
6b48e13371
Merge pull request #13772 from nextcloud/bugfix/noid/show-default-locale 
Show proper default locale
 2019-01-24 08:31:46 +01:00
dependabot[bot]
efe8d486a8
Bump webpack from 4.28.4 to 4.29.0 in /apps/oauth2 
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.4 to 4.29.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.4...v4.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 07:27:54 +00:00
dependabot[bot]
78162aef09
Bump vue-loader from 15.5.1 to 15.6.0 in /apps/oauth2 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.5.1 to 15.6.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.5.1...v15.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 07:27:16 +00:00
Nextcloud bot
2277c21f3e
[tx-robot] updated from transifex 2019-01-24 01:12:02 +00:00
Jan-Christoph Borchardt
f0ea6961f9
Merge pull request #13652 from nextcloud/bugfix/noid/darktheme-black-icon-on-empty-content 
Fix empty content icons in header on darktheme
 2019-01-23 23:44:46 +01:00
Morris Jobke
c57f886b43
Show proper default locale 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-23 23:21:05 +01:00
Roeland Jago Douma
425edf88d7
Merge pull request #13770 from nextcloud/enhancement/post-login-hook-is-token 
Add isTokenLogin argument to post login hook/event
 2019-01-23 22:12:51 +01:00
Christoph Wurst
ad5a658e0c
Add isTokenLogin argument to post login hook/event 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-23 19:47:47 +01:00
John Molakvoæ
31335f983c
Merge pull request #13734 from nextcloud/bugfix/noid/link-share-breadcrumb 
Call proper function when fetching link shares in the breadcrumb view
 2019-01-23 19:14:41 +01:00
Morris Jobke
ae25fd2389
Merge pull request #13217 from nextcloud/add-acceptance-tests-for-moving-and-copying-files 
Add acceptance tests for moving and copying files
 2019-01-23 18:48:21 +01:00
Morris Jobke
d549954024
Merge pull request #13766 from nextcloud/fix/13757/urlencode_requesttoken 
Urlencode the requesttoken
 2019-01-23 18:29:18 +01:00
Roeland Jago Douma
2767139ca9
Merge pull request #13764 from nextcloud/design/text-preview-size 
Reduce text size of text file preview, fix #13720
 2019-01-23 17:01:46 +01:00
Roeland Jago Douma
e3de4edc51
Urlencode the requesttoken 
Followup of #13757

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 16:16:31 +01:00
Jan-Christoph Borchardt
9147a12ee1
Reduce text size of text file preview, fix #13720 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-23 15:37:08 +01:00
Roeland Jago Douma
68c0fd3863
Merge pull request #13757 from nextcloud/enh/also_cache_logout_route 
Allow caching of the logout route
 2019-01-23 15:32:36 +01:00
Roeland Jago Douma
ebd9f30d85
Request plain logout url 
By requesting the plain logout url we allow it to be properly cached by
the caching router. We just add the requesttoken manually.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 14:06:03 +01:00
Joas Schilling
71e394d9cf
Fix empty content icons on darktheme 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-23 12:55:19 +01:00
Morris Jobke
d59de22525
Merge pull request #13730 from nextcloud/fix/naturalsort-locale 
Respect user locale in natural sort comparator
 2019-01-23 12:19:01 +01:00
Roeland Jago Douma
f2b118a256
Merge pull request #13747 from nextcloud/fix/honor_session_lifetime_if_remember_cookie_is_disabled 
Honor remember_login_cookie_lifetime
 2019-01-23 10:12:01 +01:00
Roeland Jago Douma
308d5d54de
Merge pull request #13738 from nextcloud/bugfix/noid/socialsharing 
Fix social sharing apps integration
 2019-01-23 09:54:35 +01:00
Roeland Jago Douma
e6333c8fe3
Honor remember_login_cookie_lifetime 
If the remember_login_cookie_lifetime is set to 0 this means we do not
want to use remember me at all. In that case we should also not creatae
a remember me cookie and should create a proper temp token.

Further this specifies that is not 0 the remember me time should always
be larger than the session timeout. Because else the behavior is not
really defined.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 08:46:24 +01:00
Nextcloud bot
2ba75ac9b0
[tx-robot] updated from transifex 2019-01-23 01:12:05 +00:00
Jan-Christoph Borchardt
ccc35d5566
Merge pull request #13648 from nextcloud/darktheme-fix 
🕶 Dark theme fixes
 2019-01-22 16:30:14 +01:00
Morris Jobke
90e985fe4f
Merge pull request #13739 from nextcloud/cache-cleanup-change 
cleanup shared lock if changing to exclusive lock failed
 2019-01-22 16:11:46 +01:00
Julius Härtl
e5445ccbba
Call proper function when fetching link shares in the breadcrumb view 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-22 15:56:42 +01:00
Robin Appelman
f69c2d1e84
cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:32:48 +01:00
Julius Härtl
6fdc5092e5
Bump share-backend.js bundle 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-22 15:32:08 +01:00
Julius Härtl
d36f2af161
Fix integration of social sharing into the link popover menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-01-22 15:30:44 +01:00
Roeland Jago Douma
0d33302350
Merge pull request #13714 from nextcloud/feature/noid/ocs-resources 
Allow OCS resources as well
 2019-01-22 15:13:48 +01:00
Joas Schilling
92edd40e51
Make RouteConfig strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Joas Schilling
f8b74cf0a5
Allow resources via OCS as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Roeland Jago Douma
f8275a7c98
Merge pull request #13722 from nextcloud/design/noid/personal-security-settings 
Move 2FA settings above devices & sessions
 2019-01-22 13:26:10 +01:00
John Molakvoæ
b1d4c3f50b
Merge pull request #13642 from nextcloud/contacts-menu-url-fix 
Allow access to addressbook unique uri
 2019-01-22 13:00:07 +01:00
Daniel Calviño Sánchez
374b02c7bc Add acceptance tests for copying files to the same folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:51:53 +01:00
Daniel Calviño Sánchez
42457c8b23 Add acceptance tests for moving and copying selections to another folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:36:13 +01:00
Daniel Calviño Sánchez
4fcabf167e Add acceptance tests for moving and copying files to another folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:27:06 +01:00
Christoph Wurst
f0265cccf2
Respect user locale in natural sort comparator 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-22 10:16:40 +01:00
Roeland Jago Douma
5f61fafaaa
Merge pull request #13683 from nextcloud/dependabot/npm_and_yarn/handlebars-4.0.12 
Bump handlebars from 4.0.5 to 4.0.12
 2019-01-22 10:10:45 +01:00
John Molakvoæ (skjnldsv)
22112bf71d
Allow access to addressbook unique uri 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: Joas Schilling <coding@schilljs.com>
 2019-01-22 10:03:56 +01:00
Roeland Jago Douma
03290df8d4
Merge pull request #13723 from kofemann/patch-1 
apps: file-upload: fix typo in comments
 2019-01-22 09:26:40 +01:00
dependabot[bot]
7844ef0e0f
Bump handlebars from 4.0.5 to 4.0.12 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.5 to 4.0.12.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.5...v4.0.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-22 09:11:21 +01:00
Roeland Jago Douma
dbc184c859
Merge pull request #13678 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/nextcloud-vue-0.6.0 
Bump nextcloud-vue from 0.5.0 to 0.6.0 in /apps/updatenotification
 2019-01-22 09:05:58 +01:00
Roeland Jago Douma
fa4b405633
Merge pull request #13677 from nextcloud/dependabot/npm_and_yarn/@babel/preset-env-7.2.3 
Bump @babel/preset-env from 7.2.0 to 7.2.3
 2019-01-22 09:05:11 +01:00
dependabot[bot]
9032ebbdab
Bump @babel/preset-env from 7.2.0 to 7.2.3 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.2.0 to 7.2.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-22 09:04:00 +01:00
Roeland Jago Douma
9fc8e44a54
Merge pull request #13679 from nextcloud/dependabot/npm_and_yarn/settings/dompurify-1.0.9 
Bump dompurify from 1.0.8 to 1.0.9 in /settings
 2019-01-22 08:58:44 +01:00