mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
47,652 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

47652 Commits

Author SHA1 Message Date
Morris Jobke e578672704
Merge pull request #15003 from nextcloud/version/noid/15.0.7 
15.0.7
 2019-04-08 23:20:58 +02:00
Morris Jobke dc0a33086b
15.0.7 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-04-08 22:07:50 +02:00
Morris Jobke 978b4c9424
Merge pull request #15001 from nextcloud/backport/14985/stable15 
[stable15] Check if OCA.Files.App is available before calling
 2019-04-08 22:06:53 +02:00
Morris Jobke 5b932ed8e6
Merge pull request #15000 from nextcloud/backport/14989/stable15 
[stable15] Harden appdata putcontent
 2019-04-08 22:03:01 +02:00
Julius Härtl 64a507aaa3
Check if OCA.Files.App is available before calling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-04-08 16:37:03 +02:00
Roeland Jago Douma dc99cc7eab Harden appdata putcontent 
If for whatever reason appdata got into a strange state this will at
least propegate up and not make it do boom the next run.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-04-08 14:36:37 +00:00
Morris Jobke 3fc462e332
Merge pull request #14968 from nextcloud/backport/13790/stable15 
[stable15] Fix for crashing occ files:scan
 2019-04-08 15:22:43 +01:00
Morris Jobke 4021e76368
Fix unnecessary boolean cast 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-04-08 15:55:03 +02:00
fretn 2e2e50ca4e
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-04-08 15:55:03 +02:00
Morris Jobke 20687ade09
Merge pull request #14984 from nextcloud/fix/noid/drone-yml 
[stable15] Fix .drone.yml syntax
 2019-04-08 14:38:50 +01:00
Morris Jobke fc76a1ad64
Fix .drone.yml syntax 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-04-08 14:09:55 +02:00
Nextcloud bot 0ef37a11c6
[tx-robot] updated from transifex 2019-04-08 00:14:29 +00:00
Nextcloud bot 489837eb0f
[tx-robot] updated from transifex 2019-04-07 00:13:31 +00:00
Nextcloud bot 22599e2c58
[tx-robot] updated from transifex 2019-04-06 00:13:20 +00:00
Nextcloud bot 893947ed2d
[tx-robot] updated from transifex 2019-04-05 00:13:25 +00:00
Roeland Jago Douma b9d5e72be9
Merge pull request #14950 from nextcloud/version/noid/15.0.6 
15.0.6
 2019-04-04 09:19:13 +01:00
Nextcloud bot b190f0eed3
[tx-robot] updated from transifex 2019-04-04 00:13:32 +00:00
Morris Jobke 4cdcb2f35c
15.0.6 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-04-03 17:33:17 +01:00
Nextcloud bot b1ed447dd7
[tx-robot] updated from transifex 2019-04-03 00:13:45 +00:00
Nextcloud bot 1410f39efc
[tx-robot] updated from transifex 2019-04-02 00:13:48 +00:00
Morris Jobke b856d4a66c
Merge pull request #14924 from nextcloud/backport/14914/stable15 
[stable15] Fix hidden file display in grid view
 2019-04-01 12:01:27 +02:00
Julius Härtl e27831c2df Fix hidden file display in grid view 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-04-01 08:58:15 +00:00
Nextcloud bot 9f3158a098
[tx-robot] updated from transifex 2019-04-01 00:14:07 +00:00
Nextcloud bot 3bdb48f204
[tx-robot] updated from transifex 2019-03-31 01:12:53 +00:00
Nextcloud bot 5acb5ccad8
[tx-robot] updated from transifex 2019-03-30 01:13:44 +00:00
Roeland Jago Douma 446e289e44
Merge pull request #14909 from nextcloud/version/rc/15.0.6rc1 
15.0.6 RC 1
 2019-03-29 15:53:07 +01:00
Roeland Jago Douma 265973896e
15.0.6 RC 1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-29 13:33:12 +01:00
Roeland Jago Douma e953ea47ea
Merge pull request #14891 from nextcloud/stable15-14886 
[stable15] Fix opening folders from different file lists
 2019-03-29 13:32:01 +01:00
Nextcloud bot aafedb9728
[tx-robot] updated from transifex 2019-03-29 01:12:59 +00:00
Julius Härtl 8ac03c67a7
Fix opening folders from different file lists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-28 09:24:47 +01:00
Roeland Jago Douma f4cc549e86
Merge pull request #14867 from nextcloud/backport/14628/stable15 
[stable15] Fix plural rule detection for languages
 2019-03-28 08:52:53 +01:00
Nextcloud bot 528d5299c7
[tx-robot] updated from transifex 2019-03-28 01:13:33 +00:00
Roeland Jago Douma c89fe858d0
Merge pull request #14865 from nextcloud/backport/14603/stable15 
[stable15] Show a setup warning in case S3 object storage is used as primary storage
 2019-03-27 19:50:40 +01:00
Morris Jobke cfbcb2c174
Fix unneeded doc link to unrelated resource 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-27 13:34:36 +01:00
Morris Jobke 689b7c19de
Show a setup warning in case S3 object storage is used as primary storage 
* checks for at least 50 GB of free space

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-27 13:34:36 +01:00
Morris Jobke 7b2332421b
Fix behaviour of plural default rule 
* undefined and empty string should trigger the default plural form

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-27 13:33:44 +01:00
Joas Schilling 156419af80
Rename the variable aswell 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-27 13:33:44 +01:00
Joas Schilling b9684ee0d3
Fix plural rule detection for languages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-27 13:33:44 +01:00
Nextcloud bot c1fa96596a
[tx-robot] updated from transifex 2019-03-27 12:06:38 +00:00
Roeland Jago Douma bbb0a62295
Merge pull request #14882 from nextcloud/backport/stable15/fix_translations 
[stable15] Fix translations of settings
 2019-03-27 12:52:42 +01:00
Roeland Jago Douma 8217ec3da5
[stable15] Fix translations of settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-27 12:52:21 +01:00
Morris Jobke c7a1e6c65e
Merge pull request #14859 from nextcloud/backport/14853/stable15 
[stable15] Make regions translatable
 2019-03-26 17:44:55 +01:00
Morris Jobke 087fa7f395
Merge pull request #14857 from nextcloud/backport/14398/stable15 
[stable15] Add setup check for missing UTF8MB4 on mysql
 2019-03-26 17:20:38 +01:00
Morris Jobke 31fb0896a0
Add setup check for missing UTF8MB4 on mysql 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-26 14:56:24 +01:00
Morris Jobke be8a82ecba
Merge pull request #14855 from nextcloud/backport/14583/remove-g+-federation 
[stable15] Remove Google+ federation usersettings
 2019-03-26 14:16:11 +01:00
Morris Jobke 986fec3f19
Merge pull request #14854 from nextcloud/backport/14790/fix-setup-checks-15 
[stable15] Fix setup checks for ocm/ocs-provider
 2019-03-26 13:41:53 +01:00
Morris Jobke 501545923f Make regions translatable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-26 11:09:36 +00:00
Marius Blüm fc7ac08565
Remove G+ CSS rule (Feedback from Joas) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-26 11:53:20 +01:00
Marius Blüm 9c7a6c2c53
Remove G+ code from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-26 11:52:15 +01:00
Marius Blüm 89c0d879bc
Remove G+ icon from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-26 11:51:58 +01:00