summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-12-124-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | Merge pull request #35712 from nextcloud/backport/35097/stable25Joas Schilling2022-12-114-26/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable25] Improve email results for sharing
| * | | | | | | | Improve email search resultsJoas Schilling2022-12-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | Validate if the user part of a "cloud id" can even be a valid user idJoas Schilling2022-12-093-26/+55
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #35706 from nextcloud/backport/35705/stable25Joas Schilling2022-12-111-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable25] Update sensitive config list of Talk
| * | | | | | | | Update sensitive config list of TalkJoas Schilling2022-12-091-1/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #35727 from nextcloud/backport/35689/stable25John Molakvoæ2022-12-111-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable25] preview: fix HEIC orientation
| * | | | | | | | preview: fix HEIC orientationVarun Patil2022-12-111-0/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Varun Patil <varunpatil@ucla.edu>
* | / / / / / / [tx-robot] updated from transifexNextcloud bot2022-12-1114-0/+32
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2022-12-10188-424/+586
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0958-540/+114
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #35639 from nextcloud/backport/35222/stable25Pytal2022-12-083-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable25] Fix contrast of global search headings
| * | | | | | Fix contrast of global search headingsChristopher Ng2022-12-083-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> (cherry picked from commit 29b1748e2c1114aeac41dbe93043a022d6c54a34)
* | | | | | Merge pull request #35517 from nextcloud/backport/35484/stable25Simon L2022-12-088-81/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable25] fix the popovermenu
| * | | | | | try to fix the popovermenuSimon L2022-12-088-81/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | Merge pull request #35669 from nextcloud/release/25.0.2v25.0.2blizzz2022-12-081-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | 25.0.2
| * | | | | 25.0.2Arthur Schiwon2022-12-081-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0820-2/+122
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0720-14/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #35623 from nextcloud/release/25.0.2_rc3v25.0.2rc3blizzz2022-12-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | 25.0.2 RC3
| * | | | | 25.0.2 RC3Arthur Schiwon2022-12-061-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #35616 from ↵Vincent Petry2022-12-062-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/fix/empty-secret-migration-files-external [stable25] Fix migration to non-empty secret
| * | | | | Add commentsCarl Schwan2022-12-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit 5e31ed4f526e943e695d994a6434ed71d1a45c1c)
| * | | | | Fix migration to non-empty secretCarl Schwan2022-12-062-2/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a fallback for empty keys Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit 754cb58b1259a58f626d47c2193b92c651d3b2d8)
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-06108-102/+478
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #35605 from nextcloud/backport/stable25/31499Vincent Petry2022-12-055-12/+70
|\ \ \ \ \ | | | | | | | | | | | | [stable25] Add fallback routines for empty secret cases
| * | | | | Mark method as deprecatedCarl Schwan2022-12-052-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit ef31396727771eb771b450e91e7b097b2ca151b9)
| * | | | | Fix unit testsCarl Schwan2022-12-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit 01e2a26749da63e3e06c36d9151570c5beda78d2)
| * | | | | Fix decryption fallback after adding a secretJulius Härtl2022-12-051-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit a6796b424784561f4ab76d04324985f1f2f6a75f)
| * | | | | Rotate token after fallbackJulius Härtl2022-12-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit 553cb499b2abf51b1edd9b2deb309cec6cff35b6)
| * | | | | Add fallback routines for empty secret casesJulius Härtl2022-12-054-5/+41
|/ / / / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> (cherry picked from commit 81f8719cc0fdc2fc25a00ac1412ffc63cd62eabf)
* | | | | Merge pull request #35606 from nextcloud/backport/35580/stable25Simon L2022-12-052-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [stable25] downgrade ubuntu in order to fix CI
| * | | | | downgrade ubuntu in order to fix CISimon L2022-12-052-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0522-100/+186
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0424-100/+296
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0312-6/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-12-0216-12/+50
|/ / / / | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #35487 from nextcloud/release/25.0.2_rc2v25.0.2rc2blizzz2022-12-011-2/+2
|\ \ \ \ | | | | | | | | | | 25.0.2 RC2
| * | | | 25.0.2 RC2Arthur Schiwon2022-11-291-2/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2022-12-0168-30/+276
| |/ / |/| | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | [tx-robot] updated from transifexNextcloud bot2022-11-30168-448/+614
|/ / | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | Merge pull request #35478 from nextcloud/backport/35471/stable25Vincent Petry2022-11-291-1/+1
|\ \ | |/ |/| [stable25] Allow upgrading from ownCloud 10.11
| * Remove ownCloud 10.5 upgrade pathVincent Petry2022-11-291-1/+0
| | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * Allow upgrading from ownCloud 10.11Vincent Petry2022-11-291-0/+1
|/ | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* [tx-robot] updated from transifexNextcloud bot2022-11-29160-588/+630
| | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* Merge pull request #35453 from nextcloud/backport/35434/stable25Pytal2022-11-281-2/+1
|\ | | | | [stable25] fix update for 32-bit
| * fix update for 32-bitSimon L2022-11-281-2/+1
| | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de>
* | Merge pull request #35454 from nextcloud/revert-35346-backport/35315/stable25Pytal2022-11-285-21/+21
|\ \ | |/ |/| [stable25] Revert "[stable25] Fix border color contrast"
| * Revert "[stable25] Fix theming tests"Simon L2022-11-281-4/+4
| | | | | | | | Signed-off-by: Simon L <szaimen@e.mail.de>
| * Revert "[stable25] Fix border color contrast"Simon L2022-11-284-17/+17
|/ | | | Signed-off-by: Simon L <szaimen@e.mail.de>