upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
51190 commits 982 branches 1211 tags 8.6 GiB
Commit graph

51190 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
f048380a5f
Merge pull request #21055 from nextcloud/backport/21050/stable17 
[stable17] Caching and compression for app store requests
 2020-05-20 13:26:58 +02:00
Morris Jobke
2e41b6f83c
Compress the appstore requests by default 
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>
 2020-05-20 11:19:42 +02:00
Morris Jobke
8b2d609a6a
Cache appstore requests for 60 instead of 5 minutes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-20 11:19:42 +02:00
Nextcloud bot
a075be51ef
[tx-robot] updated from transifex 2020-05-20 02:16:47 +00:00
Nextcloud bot
a2a183fcb3
[tx-robot] updated from transifex 2020-05-19 02:17:29 +00:00
Morris Jobke
83f2f69fc0
Merge pull request #20993 from nextcloud/backport/20941/stable17 
[stable17] update icewind/smb to 3.2.4
 2020-05-18 11:04:16 +02:00
Nextcloud bot
14aa9ae1e5
[tx-robot] updated from transifex 2020-05-18 02:16:44 +00:00
Nextcloud bot
b4287fbf7c
[tx-robot] updated from transifex 2020-05-17 02:17:17 +00:00
Nextcloud bot
6a6dc52d46
[tx-robot] updated from transifex 2020-05-16 02:17:36 +00:00
Robin Appelman
085fae9ad9
update icewind/smb to 3.2.4 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-15 17:22:53 +02:00
Morris Jobke
bccec95a96
Merge pull request #20882 from nextcloud/backport/20841/stable17 
[stable17] add locking to resolve concurent move to trashbin conflicts
 2020-05-15 14:55:15 +02:00
Roeland Jago Douma
31ecdfb196
Merge pull request #20977 from nextcloud/dependabot/npm_and_yarn/build/stable17/handlebars-4.6.0 
[Security] Bump handlebars from 4.3.0 to 4.6.0 in /build
 2020-05-15 08:12:42 +02:00
Nextcloud bot
539909fed4
[tx-robot] updated from transifex 2020-05-15 02:17:38 +00:00
dependabot-preview[bot]
fb714e0322
[Security] Bump handlebars from 4.3.0 to 4.6.0 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.3.0 to 4.6.0. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.0...v4.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-14 13:06:02 +00:00
Nextcloud bot
377c68128e
[tx-robot] updated from transifex 2020-05-14 02:16:58 +00:00
Nextcloud bot
f72185451a
[tx-robot] updated from transifex 2020-05-13 02:16:45 +00:00
Nextcloud bot
7774315bc9
[tx-robot] updated from transifex 2020-05-12 02:16:31 +00:00
Roeland Jago Douma
3c7cd001cd
Merge pull request #20925 from nextcloud/backport/20915/stable17 
[stable17] Use random_bytes
 2020-05-11 21:00:39 +02:00
Roeland Jago Douma
c76487e6c0
Merge pull request #20775 from nextcloud/backport/19743/stable17 
[stable17] dont try to update storage mtime if we can't get the mtime
 2020-05-11 16:43:44 +02:00
Roeland Jago Douma
8fabe71710 Use random_bytes 
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>
 2020-05-11 12:27:06 +00:00
Roeland Jago Douma
930e96d0b2
Merge pull request #20748 from nextcloud/backport/20718/stable17 
[stable17] Add a wrapper to fall back to the share owner on public shares
 2020-05-11 13:14:14 +02:00
Nextcloud bot
a1960e58ef
[tx-robot] updated from transifex 2020-05-11 02:16:30 +00:00
Nextcloud bot
b5e868686c
[tx-robot] updated from transifex 2020-05-10 02:16:19 +00:00
Nextcloud bot
373079c1e8
[tx-robot] updated from transifex 2020-05-09 02:16:58 +00:00
Robin Appelman
069870a82f add locking to resolve concurent move to trashbin conflicts 
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-08 11:29:56 +00:00
Nextcloud bot
23fb63daeb
[tx-robot] updated from transifex 2020-05-08 02:16:25 +00:00
Nextcloud bot
f2c27a166a
[tx-robot] updated from transifex 2020-05-07 02:16:32 +00:00
Nextcloud bot
23a7c00aa6
[tx-robot] updated from transifex 2020-05-06 02:16:48 +00:00
Nextcloud bot
88d98a0072
[tx-robot] updated from transifex 2020-05-05 02:16:33 +00:00
Morris Jobke
3a20d43277
Merge pull request #20809 from nextcloud/backport/20807/stable17 
[stable17] clarified trash bin retention by storage shortage override in config.sample.php
 2020-05-04 14:07:14 +02:00
Sascha Wiswedel
953234db00 clarified trash bin retention by storage shortage override 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2020-05-04 11:42:49 +00:00
Nextcloud bot
b7f6b7541e
[tx-robot] updated from transifex 2020-05-04 02:16:37 +00:00
Nextcloud bot
4f17611ba0
[tx-robot] updated from transifex 2020-05-03 02:16:34 +00:00
Nextcloud bot
14c45201b1
[tx-robot] updated from transifex 2020-05-02 02:16:53 +00:00
Robin Appelman
8a027c3fb3 dont try to update storage mtime if we can't get the mtime 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-01 16:22:59 +00:00
Roeland Jago Douma
a9d778336c
Merge pull request #20764 from nextcloud/backport/20710/stable17 
[stable17] Fix Argon2 options checks
 2020-05-01 14:43:08 +02:00
MichaIng
c9ce1197c4 Fix Argon2 options checks 
The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum.
Options are now applied the following way:
- If config.php contains the setting with an integer higher or equal to the minimum, it is applied.
- If config.php contains the setting with an integer lower than the minimum, the minimum is applied.
- If config.php does not contain the setting or with no integer value, the PHP default is applied.

Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 09:39:03 +00:00
Roeland Jago Douma
18eb25c502
Fix owner on publicownerwrapper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 11:21:54 +02:00
Roeland Jago Douma
3cabd830eb
Merge pull request #20751 from nextcloud/backport/20744/stable17 
[stable17] Fix public layout header title & description
 2020-05-01 09:07:39 +02:00
Roeland Jago Douma
ee22a15e1b
Merge pull request #19496 from nextcloud/dependabot/npm_and_yarn/build/stable17/handlebars-4.3.0 
[Security] Bump handlebars from 4.1.2 to 4.3.0 in /build
 2020-05-01 09:06:05 +02:00
Nextcloud bot
00c3fb93ba
[tx-robot] updated from transifex 2020-05-01 02:17:07 +00:00
John Molakvoæ (skjnldsv)
29d9cca417
Fix public layout header title & description 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-30 19:22:46 +02:00
Roeland Jago Douma
325f84bd0d Add a wrapper to fall back to the share owner on public shares 
Else it might happen that we setup a storage that has no real owner and
activities do boom etc (looking at you groupfolders and external
storages!).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-30 12:43:21 +00:00
dependabot-preview[bot]
a52178eb47
[Security] Bump handlebars from 4.1.2 to 4.3.0 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-30 07:14:23 +00:00
Nextcloud bot
f33923c8e8
[tx-robot] updated from transifex 2020-04-30 02:17:30 +00:00
Roeland Jago Douma
4cab78133c
Merge pull request #20683 from nextcloud/backport/20650/stable17 
[stable17] Adhere to EMailTemplate interface in constructor call.
 2020-04-29 10:26:34 +02:00
Roeland Jago Douma
0558a25e97
Merge pull request #20704 from nextcloud/backport/20636/stable17 
[stable17] Add tests for update notification controller for non-default updater …
 2020-04-29 10:10:41 +02:00
Roeland Jago Douma
890d823c6d
Merge pull request #20681 from nextcloud/backport/20632/stable17 
[stable17] Only catch anonymous OPTIONS for Office
 2020-04-29 10:10:07 +02:00
Nextcloud bot
090d36b136
[tx-robot] updated from transifex 2020-04-29 02:17:13 +00:00
Morris Jobke
a7e5b6aeb5 Add tests for update notification controller for non-default updater server URL 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-04-28 14:21:05 +00:00