summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21095 from nextcloud/backport/21090/stable19Roeland Jago Douma2020-05-262-10/+9
|\ | | | | [stable19] Do not read certificate bundle from data dir by default
| * Do not read certificate bundle from data dir by defaultMorris Jobke2020-05-252-10/+9
| | | | | | | | | | | | | | | | | | | | | | Before the resources/config/ca-bundle.crt was only used when the list of custom certificates was empty and the instance was not installed. But it should also be used when the list is empty and the instance is installed. This is inverting the logic to stop if the instance is not installed to use the default bundle. And it also does this when the list is empty. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #21068 from nextcloud/backport/20776/stable19Morris Jobke2020-05-261-6/+20
|\ \ | | | | | | [stable19] Improve group queries
| * | Improve group queriesRoeland Jago Douma2020-05-221-6/+20
| |/ | | | | | | | | | | | | | | | | | | | | Before we'd also get the diplayname for each group in the backend. In a separate query. This is of course not ideal as this information is obtained on each and every query. Now this is queried once and properly cached. Also added more caching to the manager. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21060 from nextcloud/version/19/finalv19.0.0Roeland Jago Douma2020-05-261-2/+2
|\ \ | | | | | | 19 Final
| * | 19 FinalRoeland Jago Douma2020-05-211-2/+2
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21105 from nextcloud/backport/21092/stable19Roeland Jago Douma2020-05-265-9/+10
|\ \ | |/ |/| Update recommended apps
| * Update hub bundle and add proxy rule to htaccessJulius Härtl2020-05-255-9/+10
|/ | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Merge pull request #20964 from nextcloud/version/19/rc3v19.0.0RC3Roeland Jago Douma2020-05-201-2/+2
|\ | | | | 19 RC3
| * 19 RC3Roeland Jago Douma2020-05-141-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #21028 from nextcloud/backport/20629/stable19Morris Jobke2020-05-201-1/+2
|\ \ | | | | | | [stable19] Don't load text file preview when text app is available (Fixes: #20615)
| * | Don't load text file preview when text app is available (Fixes: #20615)Jonas Meurer2020-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening a shared text document, the files_sharing app uses internal preview support in case no other app to open the text file is available. So far, it only checks for the old files_texteditor app, not for the new new text app. This commit fixes this by checking for both. Signed-off-by: Jonas Meurer <jonas@freesources.org>
* | | Merge pull request #21052 from nextcloud/backport/21050/stable19Morris Jobke2020-05-202-17/+53
|\ \ \ | | | | | | | | [stable19] Caching and compression for app store requests
| * | | Compress the appstore requests by defaultMorris Jobke2020-05-202-8/+44
| | | | | | | | | | | | | | | | | | | | | | | | In test it reduced the transfered data from 5 MB to 2 MB. This should reduce the load on the appstore significantly. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Cache appstore requests for 60 instead of 5 minutesMorris Jobke2020-05-202-9/+9
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #21047 from nextcloud/backport/21041/stable19Roeland Jago Douma2020-05-191-0/+8
|\ \ \ | | | | | | | | [stable19] Copy over the ETag and LastModified when formatting a Dataresponse
| * | | Copy over the ETag and LastModified when formatting a DataresponseRoeland Jago Douma2020-05-191-0/+8
|/ / / | | | | | | | | | | | | | | | This way the ETag checks etc are all working. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #21029 from nextcloud/backport/21003/stable19Roeland Jago Douma2020-05-192-5/+13
|\ \ \ | | | | | | | | [stable19] Remove entries from locales.json incompatible with punic
| * | | Remove entries from locales.json incompatible with punicDaniel Kesselberg2020-05-182-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | As reported at https://github.com/nextcloud/server/issues/20999 the list contains en_US_POSIX as locale but punic is unable to parse such a locale. If you select that locale everyone is confused. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #21032 from nextcloud/backport/20846/stable19Roeland Jago Douma2020-05-193-12/+14
|\ \ \ \ | |/ / / |/| | | [stable19] Link permissions
| * | | Fix share update testJulius Härtl2020-05-181-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Update public link share permission codeRoeland Jago Douma2020-05-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Have share permissions on link shares if it is enabledRoeland Jago Douma2020-05-181-9/+10
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20991 from nextcloud/backport/20941/stable19Morris Jobke2020-05-184-26/+53
|\ \ \ | |/ / |/| | [stable19] update icewind/smb to 3.2.4
| * | update icewind/smb to 3.2.4Robin Appelman2020-05-154-26/+53
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #20963 from nextcloud/backport/20947/stable19Roeland Jago Douma2020-05-141-3/+3
|\ \ | |/ |/| [stable19] Bump yargs-parser
| * Bump yargs-parserChristoph Wurst2020-05-141-3/+3
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20850 from nextcloud/version/19/rc2Roeland Jago Douma2020-05-141-2/+2
|\ | | | | 19 RC2
| * 19 RC2Roeland Jago Douma2020-05-141-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20960 from nextcloud/backport/20952/stable19Roeland Jago Douma2020-05-141-1/+1
|\ | | | | [stable19] Respect exit code of lint run - changed from -exec to xargs as this e…
| * Respect exit code of lint run - changed from -exec to xargs as this exits ↵Morris Jobke2020-05-131-1/+1
| | | | | | | | | | | | properly Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #20961 from nextcloud/backport/20958/stable19Roeland Jago Douma2020-05-141-0/+6
|\ \ | |/ |/| [stable19] Allow links to conversations
| * Allow links to conversationsJoas Schilling2020-05-131-0/+6
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #20954 from nextcloud/backport/20951/stable19Roeland Jago Douma2020-05-131-1/+1
|\ | | | | [stable19] Trailing comma's in functin arguments break on 7.2
| * Trailing comma's in functin arguments break on 7.2Roeland Jago Douma2020-05-131-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20944 from nextcloud/backport/20897/stable19Roeland Jago Douma2020-05-132-6/+5
|\ \ | |/ |/| [stable19] Proxy server could cache http response when it is not private
| * Fix http cache testClement Wong2020-05-131-1/+1
| | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * Add public argument to Http cacheFor()Clement Wong2020-05-131-5/+4
| | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * Proxy server could cache http response when it is not privateClement Wong2020-05-131-2/+2
|/ | | | Signed-off-by: Clement Wong <git@clement.hk>
* Merge pull request #20940 from nextcloud/backport/20858/stable19Roeland Jago Douma2020-05-121-1/+3
|\ | | | | [stable19] Remember the webauthn name of devices
| * Remember the webauthn name of devicesRoeland Jago Douma2020-05-121-1/+3
|/ | | | | | | Fixes #20289 we should not reset to default once we have logged in with the device. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20923 from nextcloud/backport/20915/stable19Roeland Jago Douma2020-05-112-11/+24
|\ | | | | [stable19] Use random_bytes
| * Use random_bytesRoeland Jago Douma2020-05-112-11/+24
| | | | | | | | | | | | | | Since we don't care if it is human readbale. The code is backwards compatible with the old format. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20878 from nextcloud/backport/20719/stable19John Molakvoæ2020-05-114-49/+74
|\ \ | |/ |/|
| * Fix languages empty arrayGretaD2020-05-084-49/+74
| | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | Merge pull request #20880 from nextcloud/backport/20860/stable19Roeland Jago Douma2020-05-094-5/+29
|\ \ | | | | | | [stable19] macOS contacts: prefer personal over app generated
| * | Rename app-generated to z-app-generated, because macOS Contacts supports ↵Georg Ehrke2020-05-082-2/+1
| | | | | | | | | | | | | | | | | | only one and will pick the first one alphabetically Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Implement ctag and etag in ContactsInteractionGeorg Ehrke2020-05-083-3/+28
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #20885 from nextcloud/backport/20853/stable19Roeland Jago Douma2020-05-091-1/+1
|\ \ | |/ |/| [stable19] Fix color-text-maxcontrast not passing WCAG AA
| * Fix color-text-maxcontrast not passing WCAG AAJan-Christoph Borchardt2020-05-091-1/+1
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 08:32:26 +0000