summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18140 from nextcloud/bugfix/17814/csp-svgRoeland Jago Douma2019-12-031-0/+3
|\ | | | | Allow inline styles for theming images
| * Allow inline styles for theming imagesJulius Härtl2019-11-271-0/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #15952 from nextcloud/feature/noid/inherited-sharesRoeland Jago Douma2019-12-0321-178/+814
|\ \ | | | | | | Inherited Shares
| * | fixing tests + avoid duplicate in getFormattedShares()Maxence Lange2019-12-032-9/+13
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | Inherited share UIJohn Molakvoæ (skjnldsv)2019-12-0314-120/+399
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | integration testsMaxence Lange2019-12-032-8/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> add tests on non-owner pov Signed-off-by: Maxence Lange <maxence@artificial-owl.com> duplicate Signed-off-by: Maxence Lange <maxence@artificial-owl.com> small fixes Signed-off-by: Maxence Lange <maxence@artificial-owl.com> removed tags Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | Inherited SharesMaxence Lange2019-12-035-49/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> working on users with resharing rights Signed-off-by: Maxence Lange <maxence@artificial-owl.com> -getLogger() Signed-off-by: Maxence Lange <maxence@artificial-owl.com> cleaning Signed-off-by: Maxence Lange <maxence@artificial-owl.com> fix type Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Update SharingRightsException.php
* | | Merge pull request #17443 from nextcloud/enh/expired_token_on_invalid_passRoeland Jago Douma2019-12-034-0/+42
|\ \ \ | | | | | | | | Throw an invalid token exception is token is marked outdated
| * | | Throw an invalid token exception is token is marked outdatedRoeland Jago Douma2019-12-024-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids hitting the backend with multiple requests for the same token. And will help avoid quick LDAP lockouts. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18028 from nextcloud/enhancement/user-create-eventsRoeland Jago Douma2019-12-0312-137/+308
|\ \ \ \ | | | | | | | | | | Add typed create user events
| * | | | Add typed create user eventsChristoph Wurst2019-12-0312-137/+308
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | add update all button (#17512)John Molakvoæ2019-12-0311-15/+54
|\ \ \ \ \ | |_|_|/ / |/| | | | add update all button
| * | | | Add update all buttonGreta Doci2019-11-2611-15/+54
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #18151 from nextcloud/bugfix/noid/overwrite-host-proxyRoeland Jago Douma2019-12-031-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Always return overwritehost if configured
| * | | | | Always return overwritehost if configuredJulius Härtl2019-11-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-03116-448/+910
| | | | | |
* | | | | | Merge pull request #18167 from nextcloud/simplify-versioncheckRoeland Jago Douma2019-12-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use PHP_VERSION_ID to check for the current php version
| * | | | | | Use PHP_VERSION_ID to check for the current php versionDaniel Kesselberg2019-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #17736 from nextcloud/enh/transfer_ownershipRoeland Jago Douma2019-12-0233-36/+1417
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a transfer ownership background job
| * | | | | | | Also allow transfer ownership of filesChristoph Wurst2019-12-026-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | Add a transfer ownership background jobRoeland Jago Douma2019-12-0232-35/+1407
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This job can be initiated by a user to transfer a file/folder to a target user. The target user will have to accept the job. Once that is done the transfers is initiated in the background. Both parties get notified when the job is done. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Fix files_sharing app LoadSidebar event (#17821)John Molakvoæ2019-12-0223-135/+295
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Fix files_sharing app LoadSidebar event
| * | | | | | Fix testsJohn Molakvoæ (skjnldsv)2019-12-028-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | Create sharing entry point with constantsJohn Molakvoæ (skjnldsv)2019-12-0210-19/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | Fix files_sharing app LoadSidebar eventJohn Molakvoæ (skjnldsv)2019-12-027-96/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #18159 from nextcloud/tests/comments-integrationRoeland Jago Douma2019-12-021-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Do not call count on null
| * | | | | | Do not call count on nullJulius Härtl2019-11-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #18178 from Rillian-Grant/patch-1Roeland Jago Douma2019-12-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Minor typo
| * | | | | | | Minor typoRillian Grant2019-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colon outside of italics in the bug report issue template when in every similar instance of this in this file it is inside. Signed-off-by: Rillian Grant <rillian.grant@hotmail.com>
* | | | | | | | Bump url-loader from 2.3.0 to 3.0.0 (#18171)John Molakvoæ2019-12-024-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump url-loader from 2.3.0 to 3.0.0
| * | | | | | | | Bump url-loader from 2.3.0 to 3.0.0dependabot-preview[bot]2019-12-024-10/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [url-loader](https://github.com/webpack-contrib/url-loader) from 2.3.0 to 3.0.0. - [Release notes](https://github.com/webpack-contrib/url-loader/releases) - [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/url-loader/compare/v2.3.0...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | Bump file-loader from 4.3.0 to 5.0.2 (#18172)John Molakvoæ2019-12-022-7/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump file-loader from 4.3.0 to 5.0.2
| * | | | | | | | Bump file-loader from 4.3.0 to 5.0.2dependabot-preview[bot]2019-12-012-7/+7
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.3.0 to 5.0.2. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.3.0...v5.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Bump style-loader from 1.0.0 to 1.0.1 (#18173)John Molakvoæ2019-12-022-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump style-loader from 1.0.0 to 1.0.1
| * | | | | | | | Bump style-loader from 1.0.0 to 1.0.1dependabot-preview[bot]2019-12-012-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/webpack-contrib/style-loader/releases) - [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/style-loader/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | | Bump bootstrap from 4.3.1 to 4.4.1 (#18170)John Molakvoæ2019-12-024-21/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump bootstrap from 4.3.1 to 4.4.1
| * | | | | | | | Bump bootstrap from 4.3.1 to 4.4.1dependabot-preview[bot]2019-12-014-21/+21
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.3.1 to 4.4.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.3.1...v4.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | / / / / / / [tx-robot] updated from transifexNextcloud bot2019-12-0234-152/+696
| |/ / / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-018-36/+36
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-3064-6/+470
| | | | | |
* | | | | | Merge pull request #18149 from nextcloud/fix/18148/dont-create-bundle-too-earlyRoeland Jago Douma2019-11-291-11/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | delay creation of the cert bundle
| * | | | | | delay creation of the cert bundleArthur Schiwon2019-11-281-11/+17
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #18148 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #18113 from nextcloud/bugfix/15967/webcal_cache_headersRoeland Jago Douma2019-11-294-1/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add refresh-interval to exported calendars
| * | | | | | Add refresh-interval to exported calendarsGeorg Ehrke2019-11-274-1/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #18142 from nextcloud/fix/provisioning_api/users-typingRoeland Jago Douma2019-11-291-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix provisioning_api getUsers types
| * | | | | | | Fix provisioning_api getUsers typesJohn Molakvoæ (skjnldsv)2019-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #18062 from nextcloud/drop/php71Roeland Jago Douma2019-11-292-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Drop php 7.1 support
| * | | | | | | | Fix integrationRoeland Jago Douma2019-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Drop php 7.1 supportRoeland Jago Douma2019-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18 will be relased when php7.1 is EOL already. So lets kill it! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #18133 from nextcloud/bugfix/13896/missing_from_informationRoeland Jago Douma2019-11-292-6/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Set common-name to user's displayname if none is set
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 07:53:06 +0000