summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | [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>
* / / [tx-robot] updated from transifexNextcloud bot2019-11-3064-6/+470
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-11-29156-594/+784
| |
* | [tx-robot] updated from transifexNextcloud bot2019-11-28150-498/+502
| |
* | Merge pull request #17919 from nextcloud/backport/17905/update-searchdavRoeland Jago Douma2019-11-271-0/+0
|\ \ | | | | | | [stable17] Bump icewind/searchdav
| * | [stable17] Bump icewind/searchdavDaniel Kesselberg2019-11-131-0/+0
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | [tx-robot] updated from transifexNextcloud bot2019-11-2716-12/+112
| | |
* | | Merge pull request #18100 from nextcloud/backport/18027/stable17Roeland Jago Douma2019-11-261-0/+3
|\ \ \ | | | | | | | | [stable17] Incorrect integer value: '' for column 'password_invalid' while migra…
| * | | Incorrect integer value: '' for column 'password_invalid' while migrating ↵Łukasz Buśko2019-11-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | from pg to mysql #14920 Signed-off-by: Łukasz Buśko <busko.lukasz@pm.me>
* | | | [tx-robot] updated from transifexNextcloud bot2019-11-2636-30/+168
|/ / /
* | | Merge pull request #18054 from nextcloud/backport/18016/stable17Roeland Jago Douma2019-11-251-6/+9
|\ \ \ | | | | | | | | [stable17] make chunksize (used to check for gone LDAP users) configurable
| * | | make chunksize (used to check for gone LDAP users) configurableArthur Schiwon2019-11-211-6/+9
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #18075 from nextcloud/backport/17696/stable17Roeland Jago Douma2019-11-251-2/+13
|\ \ \ \ | | | | | | | | | | [stable17] Remove objectstore credentials
| * | | | Add information about credentialsDaniel Kesselberg2019-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Remove objectstore credentialsDaniel Kesselberg2019-11-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the username for Swift v2 and add todo for unclear keys. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Remove objectstore credentialsDaniel Kesselberg2019-11-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S3: key and secret Swift v3: user.name and user.password Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | [stable17] Quickfix #17515 (#18094)John Molakvoæ2019-11-251-0/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable17] Quickfix #17515
| * | | | | Revert changes and add css-rule to correct file inside files-appRobin Windey2019-11-241-0/+4
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-2520-36/+72
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-11-244-4/+4
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2019-11-2320-52/+308
|/ / / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-11-2238-124/+196
|/ / /
* | | Merge pull request #18047 from nextcloud/backport/18030/stable17blizzz2019-11-211-8/+12
|\ \ \ | | | | | | | | [stable17] uid can be false when the user record does not exit
| * | | uid can be false when the user record does not exitArthur Schiwon2019-11-211-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | fixes not loading files app for users who got a share by the gone LDAP user Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #18040 from nextcloud/backport/18004/stable17Roeland Jago Douma2019-11-212-0/+8
|\ \ \ \ | | | | | | | | | | [stable17] Convert more columns to bigint