upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-09 11:07:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
52614 commits 884 branches 1195 tags 7 GiB
Commit graph

52614 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
12e67a306c
[tx-robot] updated from transifex 2020-05-06 02:16:39 +00:00
Nextcloud bot
6b96fe9be5
[tx-robot] updated from transifex 2020-05-05 02:16:25 +00:00
Morris Jobke
2212315d30
Merge pull request #20808 from nextcloud/backport/20807/stable18 
[stable18] clarified trash bin retention by storage shortage override in config.sample.php
 2020-05-04 14:07:47 +02:00
Sascha Wiswedel
c9fa25c18a clarified trash bin retention by storage shortage override 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2020-05-04 11:40:07 +00:00
Nextcloud bot
bacd9c4e6b
[tx-robot] updated from transifex 2020-05-04 02:16:28 +00:00
Nextcloud bot
b7b6d0e573
[tx-robot] updated from transifex 2020-05-03 02:16:25 +00:00
Nextcloud bot
e96858d98b
[tx-robot] updated from transifex 2020-05-02 02:16:43 +00:00
Roeland Jago Douma
de43edca3b
Merge pull request #20763 from nextcloud/backport/20710/stable18 
[stable18] Fix Argon2 options checks
 2020-05-01 14:43:26 +02:00
Roeland Jago Douma
78dbf5df85
Merge pull request #20635 from nextcloud/backport/20587/stable18 
[stable18] Allow specifying a default expiration date
 2020-05-01 13:03:41 +02:00
MichaIng
e5f1523577 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:37:24 +00:00
Roeland Jago Douma
7b0819c511
Allow specifying a default expiration date 
This overrides the max expiration date.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 09:14:25 +02:00
Roeland Jago Douma
cfd6f0b6fb
Merge pull request #20740 from nextcloud/backport/20262/stable18 
[stable18] Allow to navigate to others with access from the sidebar
 2020-05-01 09:08:59 +02:00
Roeland Jago Douma
acf9b2fa0d
Merge pull request #20750 from nextcloud/backport/20744/stable18 
[stable18] Fix public layout header title & description
 2020-05-01 09:07:26 +02:00
Nextcloud bot
e8976b8e34
[tx-robot] updated from transifex 2020-05-01 02:16:58 +00:00
John Molakvoæ (skjnldsv)
8436c1c280
Fix public layout header title & description 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-30 19:21:53 +02:00
Roeland Jago Douma
5d8c24009c Allow to navigate to others with access from the sidebar 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-30 08:28:37 +00:00
Nextcloud bot
f5da6c8f7a
[tx-robot] updated from transifex 2020-04-30 02:17:21 +00:00
Morris Jobke
277a97ccd8
Merge pull request #20647 from nextcloud/backport/19002/stable18 
[stable18] Fix security header setting in .htaccess by adding 'onsuccess unset'
 2020-04-29 14:59:04 +02:00
Roeland Jago Douma
b569f3c2c6
Merge pull request #20680 from nextcloud/backport/20632/stable18 
[stable18] Only catch anonymous OPTIONS for Office
 2020-04-29 10:09:49 +02:00
Nextcloud bot
988c562fe4
[tx-robot] updated from transifex 2020-04-29 02:17:05 +00:00
blizzz
37cd976405
Merge pull request #20701 from nextcloud/backport/20676/stable18 
[stable18] Don't remove last user in ldap group when limit is -1
 2020-04-28 20:43:49 +02:00
Morris Jobke
6eaf873bf7
Merge pull request #20703 from nextcloud/backport/20636/stable18 
[stable18] Add tests for update notification controller for non-default updater …
 2020-04-28 17:03:46 +02:00
Morris Jobke
bab82ccea1 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:01 +00:00
Clement Wong
78571eb0c2
Don't remove last user in ldap group when limit is -1 
Signed-off-by: Clement Wong <git@clement.hk>
 2020-04-28 13:10:04 +02:00
Roeland Jago Douma
c8973c662e
Merge pull request #20682 from nextcloud/backport/20650/stable18 
[stable18] Adhere to EMailTemplate interface in constructor call.
 2020-04-28 11:30:49 +02:00
Nextcloud bot
82898e60fe
[tx-robot] updated from transifex 2020-04-28 02:16:32 +00:00
Tekhnee
7c1abc54db Adhere to EMailTemplate interface in constructor call. 
Email creation appears to have been refactored lately but it looks like custom template-based emails were left out.

Signed-off-by: Tekhnee <info@tekhnee.org>
 2020-04-27 09:12:40 +00:00
Julius Härtl
4f44e39718 Only catch anonymous OPTIONS for Office 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-04-27 08:40:14 +00:00
Nextcloud bot
4e98587e05
[tx-robot] updated from transifex 2020-04-27 02:16:23 +00:00
Nextcloud bot
19e9d28fbd
[tx-robot] updated from transifex 2020-04-26 02:16:22 +00:00
zertrin
814f19ae67 Fix security header setting in .htaccess by adding 'onsuccess unset' 
The headers might already be set by the system administrator at the http server
level (apache or nginx) for some or all virtualhosts.

Using "always set" in the .htaccess of Nextcloud leads to the situation where
the headers might be set twice (once in the default 'onsuccess' table and once
in the 'always' table)! Which leads to warnings in the admin area.

Adding "onsuccess unset" solves the problem, and forces the header in
the 'onsucess' table to be unset, and the header in the 'always' table to be set.

NOTE: with this change, Nextcloud overrides whatever the system administrator
might have already set

See github issues #16893 #16476 #16938 #18017 and discussion in PR #19002

Signed-off-by: zertrin <zertrin@gmail.com>
 2020-04-25 18:02:48 +00:00
Nextcloud bot
12ca86d8e2
[tx-robot] updated from transifex 2020-04-25 02:16:13 +00:00
Morris Jobke
ddd7a8dba5
Merge pull request #20578 from nextcloud/backport/20449/stable18 
[stable18] Array offset error due to empty file versions array
 2020-04-24 14:44:21 +02:00
Nextcloud bot
7fe5c516b5
[tx-robot] updated from transifex 2020-04-24 02:28:07 +00:00
Morris Jobke
4bcbeffeb6
Merge pull request #20588 from nextcloud/backport/20564/stable18 
[stable18] Set fileInfo correctly for LegacyTabs
 2020-04-23 14:37:08 +02:00
Morris Jobke
62bfd9d945
Merge pull request #20596 from nextcloud/backport/20575/stable18 
[stable18] Fix Sharing recommendation user display
 2020-04-23 14:36:40 +02:00
Morris Jobke
9076ae8692
Merge pull request #20602 from nextcloud/backport/20595/stable18 
[stable18] Fix IE11 upload fallback methods
 2020-04-23 10:35:40 +02:00
Nextcloud bot
517a04612d
[tx-robot] updated from transifex 2020-04-23 02:17:05 +00:00
John Molakvoæ (skjnldsv)
42e30b577f Fix IE11 upload fallback methods 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-22 20:09:06 +00:00
Roeland Jago Douma
1a1848c402
Merge pull request #20580 from nextcloud/version/18.0.4/final 
18.0.4
 2020-04-22 21:21:59 +02:00
John Molakvoæ (skjnldsv)
b990b010fa Fix Sharing recommendation user display 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-22 13:08:47 +00:00
Nextcloud bot
1e3698c8cf
[tx-robot] updated from transifex 2020-04-22 02:17:16 +00:00
Christoph Seitz
185f867bf8 Set fileInfo correctly for LegacyTabs 
Watch for changes of the fileInfo prop and propagate it to,
the underlying component.

Fixes #20106.

Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-21 13:04:07 +00:00
Roeland Jago Douma
2a496e155d
18.0.4 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-21 10:49:19 +02:00
Liam JACK
d2dae7ccf6 Fix #19066 - Array offset error due to empty file versions array 
Signed-off-by: Liam JACK <liamjack@users.noreply.github.com>
 2020-04-21 08:46:52 +00:00
Nextcloud bot
2cf8fab366
[tx-robot] updated from transifex 2020-04-21 02:16:49 +00:00
Roeland Jago Douma
8730bc2b8d
Merge pull request #20545 from nextcloud/version/18.0.4/RC2 
18.0.4 RC2
 2020-04-20 22:23:58 +02:00
Roeland Jago Douma
fc09807ae6
Merge pull request #20512 from nextcloud/backport/20246/stable18 
[stable18] Provide the proper language to the mailer
 2020-04-20 20:31:30 +02:00
Roeland Jago Douma
1e29d6923d
Merge pull request #20530 from nextcloud/backport/stable18/fix/allow_edit_admin_user 
[18] Allow to edit admin user
 2020-04-20 20:06:25 +02:00
Nextcloud bot
e8f69b45eb
[tx-robot] updated from transifex 2020-04-20 02:16:22 +00:00