summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22448 from nextcloud/stable19-phpdocRoeland Jago Douma2020-08-27224-224/+11
|\ | | | | [stable19] Add php docs build script
| * Use proper branch name in phpdoc buildsJulius Härtl2020-08-271-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Remove @package annotations from public namespaceJulius Härtl2020-08-27217-217/+0
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Remove wrongly annotated package namesJulius Härtl2020-08-276-7/+0
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Add php docs build scriptJulius Härtl2020-08-271-0/+11
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2020-08-2724-90/+106
|
* Merge pull request #22410 from nextcloud/backport/22359/stable19Roeland Jago Douma2020-08-263-0/+25
|\ | | | | [stable19] fix possible leaking scope in Flow
| * adjust since for 19Arthur 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 #22427 from nextcloud/backport/21988/stable19Roeland Jago Douma2020-08-261-40/+47
|\ \ | | | | | | [stable19] 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 #22416 from nextcloud/version/19.0.2/finalv19.0.2Roeland Jago Douma2020-08-261-2/+2
|\ \ \ | | | | | | | | 19.0.2
| * | | 19.0.2 finalRoeland Jago Douma2020-08-251-2/+2
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-2634-40/+114
| |/ |/|
* | Merge pull request #22414 from nextcloud/backport/22358/stable19John Molakvoæ2020-08-254-9/+12
|\ \ | |/ |/|
| * compiled assetsArthur Schiwon2020-08-252-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix event icon sizes and text alignmentArthur Schiwon2020-08-242-7/+10
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #22349 from nextcloud/version/19.0.2/RC2v19.0.2RC2Roeland Jago Douma2020-08-251-2/+2
|\ \ | | | | | | 19.0.2 RC2
| * | 19.0.2 RC2Roeland Jago Douma2020-08-211-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #22400 from nextcloud/backport/22394/stable19Roeland Jago Douma2020-08-251-1/+1
|\ \ \ | | | | | | | | [stable19] 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>
* / | [tx-robot] updated from transifexNextcloud bot2020-08-25168-308/+366
|/ /
* | Merge pull request #22387 from nextcloud/backport/22385/stable19Roeland Jago Douma2020-08-241-18/+24
|\ \ | | | | | | [stable19] Update the CRL
| * | Update the CRLRoeland Jago Douma2020-08-241-18/+24
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22337 from nextcloud/backport/22322/stable19Roeland Jago Douma2020-08-243-3/+7
|\ \ | | | | | | [stable19] 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-243-3/+7
| | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #22381 from nextcloud/backport/22218/stable19Roeland Jago Douma2020-08-248-12/+182
|\ \ \ | | | | | | | | [stable19] SSE: make legacy format opt in
| * | | Make legacy cipher opt inRoeland Jago Douma2020-08-248-12/+182
|/ / / | | | | | | | | | | | | | | | | | | | | | * Systems that upgrade have this enabled by default * New systems disable it * We'll have to add some wargning in the setup checks if this is enabled Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #22355 from nextcloud/backport/20772/stable19Roeland Jago Douma2020-08-242-2/+10
|\ \ \ | | | | | | | | [stable19] Properly search for users when limittogroups is enabled
| * | | In case the group backend returns $limit or more results it is expected to ↵Morris Jobke2020-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | contain more results Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Properly search for users when limittogroups is enabledRoeland Jago Douma2020-08-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Searching just for the uid is not enough. This makes sure this done properly again now. 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 #22348 from nextcloud/backport/22346/stable19Roeland Jago Douma2020-08-213-5/+5
|\ \ \ | | | | | | | | [stable19] l10n:Correct appid for WebAuthn
| * | | l10n:Correct appid for WebAuthnMichiel Janssens2020-08-213-5/+5
| | |/ | |/| | | | | | | | | | Signed-off-by: Michiel Janssens <michiel@nexigon.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #22341 from nextcloud/backport/22335/stable19Roeland Jago Douma2020-08-211-2/+10
|\ \ \ | | | | | | | | [stable19] 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>
* | | Merge pull request #22333 from nextcloud/backport/22236/stable19Roeland Jago Douma2020-08-215-6/+41
|\ \ \ | |_|/ |/| | [stable19] CalDAV: Add ability to limit sharing to owner
| * | Add ability to limit sharing to ownerGeorg Ehrke2020-08-205-6/+41
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* / [tx-robot] updated from transifexNextcloud bot2020-08-2150-80/+172
|/
* Merge pull request #22227 from nextcloud/version/19.0.2/RC1v19.0.2RC1Morris Jobke2020-08-202-115/+96
|\ | | | | 19.0.2 RC1
| * New bundleRoeland Jago Douma2020-08-131-113/+94
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * 19.0.2 RC1Roeland Jago Douma2020-08-131-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #22309 from nextcloud/backport/22221/stable19-2Morris Jobke2020-08-201-1/+1
|\ \ | | | | | | [stable19] fixing a logged deprecation message
| * | simplified backport of #22221, fixing a deprecation log messageArthur Schiwon2020-08-191-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-206-2/+6
|/ /
* | Merge pull request #21983 from nextcloud/backport/21628/stable19Morris Jobke2020-08-195-30/+54
|\ \ | | | | | | [stable19] fix moving files from external storage to object store trashbin
| * | fix object store trashbin handlingRobin Appelman2020-07-311-3/+10
| | | | | | | | | | | | | | | | | | object stores are "special" given how they interact with the cache on their own Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | dont update mimetype when moving to trashRobin Appelman2020-07-311-1/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>