summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-08-2724-90/+106
|
* Merge pull request #22411 from nextcloud/backport/22359/stable18Roeland Jago Douma2020-08-263-0/+25
|\ | | | | [stable18] fix possible leaking scope in Flow
| * adjust since for 18Arthur Schiwon2020-08-251-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix possible leaking scope in FlowArthur Schiwon2020-08-253-0/+25
| | | | | | | | | | | | | | | | | | - a configured flow can be brought into consideration, despite its event was not fired - it could either run through - or run into a RuntimeException and killing processing of valid flows Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #22415 from nextcloud/backport/22358/stable18Roeland Jago Douma2020-08-264-21/+24
|\ \ | | | | | | [stable18] fix event icon sizes and text alignment
| * | compiled assetsArthur Schiwon2020-08-252-14/+14
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix event icon sizes and text alignmentArthur Schiwon2020-08-252-7/+10
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #22428 from nextcloud/backport/21988/stable18Roeland Jago Douma2020-08-261-40/+47
|\ \ | | | | | | [stable18] Combine body-login rules in theming and fix twofactor and guest styling on bright colors
| * | Combine body-login rules in theming and fix twofactor and guest styling on ↵Julius Härtl2020-08-251-40/+47
| |/ | | | | | | | | | | bright colors Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #22417 from nextcloud/version/18.0.8/finalv18.0.8Roeland Jago Douma2020-08-261-2/+2
|\ \ | | | | | | 18.0.8
| * | 18.0.8Roeland Jago Douma2020-08-251-2/+2
| |/
* / [tx-robot] updated from transifexNextcloud bot2020-08-2634-40/+114
|/
* Merge pull request #22350 from nextcloud/version/18.0.8/RC2v18.0.8RC2Roeland Jago Douma2020-08-251-2/+2
|\ | | | | 18.0.8 RC2
| * 18.0.8 RC2Roeland Jago Douma2020-08-211-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22401 from nextcloud/backport/22394/stable18Roeland Jago Douma2020-08-251-1/+1
|\ \ | | | | | | [stable18] Fix missing FN from federated contact
| * | Fix missing FN from federated contactJohn Molakvoæ (skjnldsv)2020-08-241-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #22405 from nextcloud/backport/22390/stable18Roeland Jago Douma2020-08-253-10/+40
|\ \ \ | | | | | | | | [stable18] Make legacy format opt-in
| * | | Make legacy format opt-inRoeland Jago Douma2020-08-243-10/+40
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / [tx-robot] updated from transifexNextcloud bot2020-08-25168-308/+366
|/ /
* | Merge pull request #22388 from nextcloud/backport/22385/stable18Roeland Jago Douma2020-08-241-18/+24
|\ \ | | | | | | [stable18] Update the CRL
| * | Update the CRLRoeland Jago Douma2020-08-241-18/+24
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-08-2412-38/+180
| |
* | [tx-robot] updated from transifexNextcloud bot2020-08-2326-14/+60
| |
* | [tx-robot] updated from transifexNextcloud bot2020-08-228-6/+10
| |
* | Merge pull request #22338 from nextcloud/backport/22322/stable18Roeland Jago Douma2020-08-213-5/+9
|\ \ | | | | | | [stable18] Only copy the link when updating a share or no password was forced
| * | Only copy the link when updating a share or no password was forcedJoas Schilling2020-08-203-5/+9
| | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #22343 from nextcloud/backport/22335/stable18Roeland Jago Douma2020-08-211-2/+10
|\ \ \ | |_|/ |/| | [stable18] Remove encryption option for nextcloud external storage
| * | Remove encryption option for nextcloud external storageRoeland Jago Douma2020-08-201-2/+10
| |/ | | | | | | | | | | | | | | Fixes #16017 Since it never worked we should not show it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / [tx-robot] updated from transifexNextcloud bot2020-08-2150-80/+172
|/
* Merge pull request #22226 from nextcloud/version/18.0.8/RC1v18.0.8RC1Morris Jobke2020-08-202-115/+96
|\ | | | | 18.0.8 RC1
| * New cert bundleRoeland Jago Douma2020-08-131-113/+94
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * 18.0.8 RC1Roeland Jago Douma2020-08-131-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22310 from nextcloud/backport/22221/stable18-2Joas Schilling2020-08-201-1/+1
|\ \ | | | | | | [stable18] fixing a logged deprecation message #22309
| * | simplified backport of #22221, fixing a deprecation log messageArthur Schiwon2020-08-191-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #22306 from nextcloud/backport/22300/stable18Morris Jobke2020-08-202-1/+7
|\ \ \ | | | | | | | | [stable18] Allow to disable share emails
| * | | Allow to disable share emailsJoas Schilling2020-08-192-1/+7
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / [tx-robot] updated from transifexNextcloud bot2020-08-206-2/+6
|/ /
* | Merge pull request #22301 from nextcloud/backport/22299/stable18Morris Jobke2020-08-192-2/+10
|\ \ | | | | | | [stable18] Show disabled user count in occ user:report
| * | Show disabled user count in occ user:reportMorris Jobke2020-08-192-2/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #22240 from nextcloud/backport/22128/stable18Morris Jobke2020-08-192-11/+20
|\ \ \ | |/ / |/| | [stable18] Delete chunks if the move on an upload failed
| * | Fix broken backportJoas Schilling2020-08-192-3/+8
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Return proper status when file didn't exist beforeJulius Härtl2020-08-131-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Adjust chunking test for non-existing target nodeJulius Härtl2020-08-131-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Delete chunks if the move on an upload failedJulius Härtl2020-08-131-6/+9
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1926-2/+56
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1830-54/+116
| | |
* | | Merge pull request #22268 from nextcloud/backport/22087/stable18Morris Jobke2020-08-174-5/+5
|\ \ \ | | | | | | | | [stable18] Fix browser freeze on long password input
| * | | Fix browser freeze on long password inputJoas Schilling2020-08-174-5/+5
|/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1712-22/+38
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1614-0/+14
| | |