summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | 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>
* | | | | | | | | | Merge pull request #13871 from PLUTEX/masterMorris Jobke2019-03-041-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | dav: Fix handling of chunked WebDAV upload
| * | | | | | | | | | dav: Fix handling of chunked WebDAV uploadJan-Philipp Litza2019-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When $data is null (which can happen when $request->getBodyAsStream() returns null), the Exceptions says "copied bytes: 0, expected filesize: 0", which sounds more like success...
* | | | | | | | | | | Merge pull request #14499 from nextcloud/fix/svg-api/dark-modeMorris Jobke2019-03-041-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not cut full color on accessibility svg color invert
| * | | | | | | | | | | Do not cut full color on accessibility svg color invertJohn Molakvoæ (skjnldsv)2019-03-041-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | | | | Merge pull request #14510 from nextcloud/smb-3.1.1Morris Jobke2019-03-046-44/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | update icewind/smb to 3.1.1
| * | | | | | | | | | | | update icewind/smb to 3.1.1Robin Appelman2019-03-046-44/+18
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | | | | Merge pull request #13401 from nextcloud/improve-lookup-server-behaviourRoeland Jago Douma2019-03-042-5/+44
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | improve lookup server behaviour
| * | | | | | | | | | | | increase timespan between each retryBjoern Schiessle2019-02-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | | | | | | improve lookup server behaviourBjoern Schiessle2019-01-072-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to connect to the lookup server if the lookup server was disabled by the admin or an empty lookup server URL was given Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | | | | | | Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-settingMorris Jobke2019-03-0419-649/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Remove the upload and memory setting
| * | | | | | | | | | | | Remove the upload and memory settingJoas Schilling2019-03-0419-649/+7
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unneeded private method phpFileSize() * Bump autoloader * Remove setUploadLimit tests * Remove integrity check hacks for upload limit Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | | | Merge pull request #12978 from tobiasKaminsky/noteOnDavMorris Jobke2019-03-042-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Add note to dav endpoint
| * | | | | | | | | | | Update apps/dav/lib/Connector/Sabre/Node.phpChristoph Wurst2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: tobiasKaminsky <tobias@nextcloud.com>