summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * using IShare::Maxence Lange2019-12-112-7/+8
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * adding share type circlesMaxence Lange2019-12-112-2/+6
| | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | [tx-robot] updated from transifexNextcloud bot2019-12-1224-2/+24
| |
* | Merge pull request #18358 from nextcloud/backport/18231/stable17Roeland Jago Douma2019-12-113-15/+64
|\ \ | | | | | | [stable17] Fix restoring shared versions
| * | update testsRobin Appelman2019-12-111-4/+56
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Fix restoring shared versionsRoeland Jago Douma2019-12-112-11/+8
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #18352 from nextcloud/backport/18341/stable17Roeland Jago Douma2019-12-111-0/+4
|\ \ | |/ |/| [stable17] handle IPv6 addresses with an explict incoming interface at the end
| * handle IPv6 addresses with an explict incoming interface at the end (e.g ↵Konrad Bucheli2019-12-111-0/+4
|/ | | | | | | fe80::ae2d:d1e7:fe1e:9a8d%enp2s0) Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch> Signed-off-by: Konrad Bucheli <kb@open.ch>
* Merge pull request #18337 from nextcloud/backport/18189/stable17Roeland Jago Douma2019-12-115-3/+23
|\ | | | | [stable17] Sharee API GS fixes
| * Query lookup by defaultJohn Molakvoæ (skjnldsv)2019-12-103-2/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Expose capability if the lookup server should be queried by defaultRoeland Jago Douma2019-12-101-0/+5
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Always do sharee lookup on lookup server in GSRoeland Jago Douma2019-12-101-1/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-12-1110-0/+100
| |
* | Merge pull request #18332 from nextcloud/backport/18312/stable17Roeland Jago Douma2019-12-101-2/+3
|\ \ | |/ |/| [stable17] Do not disable authentication apps
| * Do not disable authentication appsRoeland Jago Douma2019-12-101-2/+3
| | | | | | | | | | | | | | | | | | | | For #18249 If an app encounters an error during loading of app.php the app is normally disabled. However. We should make sure that this doesn't happen for authentication apps (looking at your user_saml). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #18307 from nextcloud/backport/18299/stable17Roeland Jago Douma2019-12-102-0/+2
|\ \ | | | | | | [stable17] Convert various columns in oc_mounts to bigint
| * | Convert various columns in oc_mounts to bigintGeorg Ehrke2019-12-092-0/+2
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #18306 from nextcloud/backport/18184/stable17Roeland Jago Douma2019-12-103-4/+21
|\ \ \ | |_|/ |/| | [stable17] Move overwritehost check to isTrustedDomain
| * | Move overwritehost check to isTrustedDomainJulius Härtl2019-12-093-4/+21
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #18186 from nextcloud/backport/18149/stable17Roeland Jago Douma2019-12-101-11/+17
|\ \ | | | | | | [stable17] delay creation of the cert bundle
| * | delay creation of the cert bundleArthur Schiwon2019-12-021-11/+17
| | | | | | | | | | | | | | | | | | fixes #18148 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-1018-22/+134
| |/ |/|
* | Merge pull request #18247 from nextcloud/backport/18241/stable17Roeland Jago Douma2019-12-091-2/+1
|\ \ | | | | | | [stable17] Allow to unfavorite all files
| * | Allow to unfavorite all filesJoas Schilling2019-12-051-2/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-0934-38/+250
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-12-0818-96/+190
| | |
* | | [stable 17] Fix removing groups that have a slash in the name (#18257)John Molakvoæ2019-12-073-27/+27
|\ \ \ | | | | | | | | [stable 17] Fix removing groups that have a slash in the name
| * | | Fix removing groups that have a slash in the nameGary Kim2019-12-073-27/+27
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-0750-122/+276
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-0688-6/+288
| | | |
* | | | Merge pull request #18252 from nextcloud/17/bugfix/noid/tooltip-hide-dateRoeland Jago Douma2019-12-051-0/+1
|\ \ \ \ | |_|/ / |/| | | Hide the tooltip if the list row is rerendered
| * | | Hide the tooltip if the list row is rerenderedJulius Härtl2019-12-051-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-0546-42/+318
| | | |
* | | | Merge pull request #18205 from nextcloud/stable17-backport/18120Roeland Jago Douma2019-12-0410-12/+125
|\ \ \ \ | | | | | | | | | | [stable17] Backport #18120
| * | | | respect shareapi_allow_share_dialog_user_enumeration in Principal backend ↵Georg Ehrke2019-12-0310-12/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Sabre/DAV Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #18221 from nextcloud/backport/17850/stable17Roeland Jago Douma2019-12-041-0/+6
|\ \ \ \ \ | | | | | | | | | | | | [stable17] Mark "Talk" active on /call/token URLs
| * | | | | Mark "Talk" active on /call/token URLsJoas Schilling2019-12-041-0/+6
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / | | | [tx-robot] updated from transifexNextcloud bot2019-12-0444-14/+186
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-12-0460-314/+456
|/ / /
* | | Merge pull request #18198 from nextcloud/backport/17443/stable17Christoph Wurst2019-12-034-0/+42
|\ \ \ | | | | | | | | [stable17] Throw an invalid token exception is token is marked outdated
| * | | Throw an invalid token exception is token is marked outdatedRoeland Jago Douma2019-12-034-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 #18189 from nextcloud/backport/17939/stable17Roeland Jago Douma2019-12-032-20/+68
|\ \ \ | | | | | | | | [stable17] Handle token insert conflicts
| * | | Handle token insert conflictsChristoph Wurst2019-12-022-20/+68
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env-based SAML uses the "Apache auth" mechanism to log users in. In this code path, we first delete all existin auth tokens from the database, before a new one is inserted. This is problematic for concurrent requests as they might reach the same code at the same time, hence both trying to insert a new row wit the same token (the session ID). This also bubbles up and disables user_saml. As the token might still be OK (both request will insert the same data), we can actually just check if the UIDs of the conflict row is the same as the one we want to insert right now. In that case let's just use the existing entry and carry on. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / | [tx-robot] updated from transifexNextcloud bot2019-12-03116-448/+910
|/ /
* | Merge pull request #18156 from nextcloud/backport/18135/stable17Roeland Jago Douma2019-12-021-1/+1
|\ \ | | | | | | [stable17] Trim the login name
| * | Trim the login nameChristoph Wurst2019-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we keep on using it with leading or trailing whitespaces for app tokens and other logic. The reason this doesn't throw an error immediately with local users is that (My)SQL compares strings regardless of their padding by default. So we look up 'uid ' and get the row for the user 'uid'. Other back-ends will lead to a hard error, though, and the user is unable to log out as all request fail. Ref https://stackoverflow.com/a/10495807/2239067 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-0234-152/+696
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-12-018-36/+36
| | |
* | | [stable17] Fix provisioning_api getUsers types (#18157)John Molakvoæ2019-11-301-2/+2
|\ \ \ | | | | | | | | [stable17] Fix provisioning_api getUsers types
| * | | Fix provisioning_api getUsers typesJohn Molakvoæ (skjnldsv)2019-11-291-2/+2
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 01:41:11 +0000