summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14558 from nextcloud/fix/13790/fix-commentMorris Jobke2019-03-061-1/+1
|\ | | | | Fix unnecessary boolean cast
| * Fix unnecessary boolean castMorris Jobke2019-03-061-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #13327 from ↵Morris Jobke2019-03-062-0/+7
|\ \ | | | | | | | | | | | | nextcloud/allow-bracket-notation-for-remove-ipv6-address Allow bracket IPv6 address format inside IPAdress Normalizer
| * | Allow bracket IPv6 address format inside IPAdress NormalizerThomas Citharel2019-01-032-0/+7
| | | | | | | | | | | | | | | | | | When run with php's build-in server (for instance on localhost:8080), IP provided through $this->server['REMOTE_ADDR'] is [::1], which is not an acceptable format for \inet_pton. This removes the brackets if there's any. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #14553 from ↵Morris Jobke2019-03-067-2/+223
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa Clear backupcode reminder when no 2fa
| * | Do not send notification if no active 2faRoeland Jago Douma2019-03-052-2/+39
| | | | | | | | | | | | | | | | | | | | | If the job is still present we should also not fire it off if there is not a single active 2FA provider. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Clear backupcodes reminder if no 2FA is enabledRoeland Jago Douma2019-03-055-0/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14125 Listen to 2FA disable event. If a provider is disabled for a user. We check if there are no more providers. If there are no more providers we Remove the backupcode reminder notification (if still present). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #13790 from fretn/masterMorris Jobke2019-03-061-1/+1
|\ \ \ | | | | | | | | Fix for crashing occ files:scan
| * | | Fix for crashing occ files:scanfretn2019-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #14541 from nextcloud/ci/noid/disable-fragile-testsMorris Jobke2019-03-053-16/+16
|\ \ \ \ | |_|/ / |/| | | Disable fragile tests for now
| * | | Disable fragile tests for nowMorris Jobke2019-03-053-16/+16
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-testRoeland Jago Douma2019-03-051-1/+10
|\ \ \ \ | | | | | | | | | | Reduce errors in checker tests
| * | | | Reduce errors in checker tests by creating the data dirMorris Jobke2019-03-051-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | * only created if it doesn't exist yet Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14175 from skydiablo/masterMorris Jobke2019-03-051-0/+1
|\ \ \ \ | | | | | | | | | | Fix ObjectStorage expired token (v3)
| * \ \ \ Merge pull request #1 from skydiablo/fix-expired-object-storage-auth-tokenVolker2019-02-131-0/+1
| |\ \ \ \ | | | | | | | | | | | | Update SwiftFactory.php
| | * | | | Update SwiftFactory.phpVolker2019-02-131-0/+1
| |/ / / / | | | | | | | | | | Auth-Service (in explizit v3) will recheck the cached-token and will end in an "token expired exception".
* | | | | Merge pull request #14373 from nextcloud/ci/noid/add-bundle-testMorris Jobke2019-03-052-0/+24
|\ \ \ \ \ | | | | | | | | | | | | Add test for updated CA bundle
| * | | | | DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.Daniel Kesselberg2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Add test for updated CA bundleMorris Jobke2019-03-052-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #14544 from nextcloud/fix/admin-2fa-settings-leftoverMorris Jobke2019-03-051-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove leftover input that causes undefined index errors
| * | | | | Remove leftover input that causes undefined index errorsChristoph Wurst2019-03-051-1/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #14451 from ↵Morris Jobke2019-03-052-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/error-message-on-password-change Check if password can be changed for the users backend in OCS api
| * | | | Check if password can be changed for the users backend in OCS apiJulius Härtl2019-03-052-0/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #14502 from ↵Morris Jobke2019-03-056-0/+408
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/add-activities-for-group-membership-changes Add activities for group membership changes
| * | | | Dump autoloaderMorris Jobke2019-03-052-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add activities for group membership changesJoas Schilling2019-03-044-0/+404
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #14302 from ↵Morris Jobke2019-03-0515-231/+1497
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enhancement/noid/fulltextsearch-final-class nc16/fulltetsearch: moving final class to private, new interface in public
| * | | | | fixing phpdocMaxence Lange2019-03-044-63/+73
| | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | fixing INDEX_DONEMaxence Lange2019-03-041-3/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | cleaning the excerpts managmentMaxence Lange2019-03-041-11/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | cleaningMaxence Lange2019-03-042-987/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | | moving final class to private, new interface in publicMaxence Lange2019-03-0415-124/+2370
| |/ / / / | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #14529 from nextcloud/regression/13491/fix-missing-dependencyMorris Jobke2019-03-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix missing $config dependency in RetryJob
| * | | | | Fix missing $config dependency in RetryJobMorris Jobke2019-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #14528 from nextcloud/bugfix/noid/fix-database-configurationMorris Jobke2019-03-051-25/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix database configuration
| * | | | | Fix whitespacesJoas Schilling2019-03-051-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix database configurationJoas Schilling2019-03-051-3/+3
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #14519 from nextcloud/feature/config-undefinedMorris Jobke2019-03-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
| * | | | | Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$configDaniel Kesselberg2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #14470 from felixn/masterMorris Jobke2019-03-051-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | use node API for free space calculation in versions app
| * | | | | | set availableSpace to 0 if userFolder not foundFelix Nieuwenhuizen2019-03-021-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
| * | | | | | use node API for free space calculation in versions app (same method as ↵Felix Nieuwenhuizen2019-03-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trashbin app) Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | | | | | Merge pull request #14501 from nextcloud/version/noid/16.0.0-alpha-1v16.0.0alpha1Morris Jobke2019-03-041-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 16.0.0 Alpha 1
| * | | | | | | 16.0.0 Alpha 1Morris Jobke2019-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #14480 from cowai/reconnect-db-notifyRoeland Jago Douma2019-03-041-11/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Reconnect to DB after timeout for Notify command. Fixes #14479
| * | | | | | | | Correct log attributeAri Selseng2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
| * | | | | | | | Added logging to Notify command.Ari Selseng2019-03-041-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
| * | | | | | | | Reconnect to DB after timeout for Notify command. Fixes #14479Ari Selseng2019-03-031-10/+48
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | | | | | | | Merge pull request #14514 from nextcloud/fix/no_debug_outputRoeland Jago Douma2019-03-041-3/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Do not just write foobar
| * | | | | | | Do not just write foobarRoeland Jago Douma2019-03-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 18:02:10 +0000