upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27
53474 commits 882 branches 1195 tags 7.2 GiB
Commit graph

53474 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
16f4b43d94
Adjust tests to only return group IDs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-08 08:10:38 +02:00
Morris Jobke
e3a2d069ae
Remove unused use statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-05-08 07:42:00 +02:00
Robin Appelman
756fe45493
get only groupids in default share backend 
instead of getting the full group object and then only using the id anyway

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-05-04 17:42:28 +02:00
Morris Jobke
afb12ddab1
Merge pull request #20794 from nextcloud/bug/noid/scssphp-compiler-notice 
Apply patch for scssphp
 2020-05-04 14:32:51 +02:00
Morris Jobke
2c256de257
Merge pull request #20807 from nextcloud/wiswedel/trashbinRetentionClarification 
clarified trash bin retention by storage shortage override in config.sample.php
 2020-05-04 13:37:29 +02:00
Sascha Wiswedel
a85191330b
clarified trash bin retention by storage shortage override 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2020-05-04 13:25:05 +02:00
Daniel Kesselberg
7a7df07749
Apply patch for scssphp 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-05-04 10:28:41 +02:00
Morris Jobke
a93d182bac
Merge pull request #20722 from nextcloud/enh/20693/etag-capabilities 
Set etag for capabilities endpoint
 2020-05-04 10:22:01 +02:00
Morris Jobke
e102264299
Merge pull request #20787 from nextcloud/fix/resize_wrong_mime 
Fix OC_Image new resize functions
 2020-05-04 10:06:16 +02:00
Morris Jobke
6aceb39714
Merge pull request #19124 from nextcloud/bug/13647/ignore-delete-groups 
Exclude groups from sharing: Skip delete groups
 2020-05-04 10:02:32 +02:00
Joas Schilling
afc5966558
Merge pull request #20749 from nextcloud/bug/noid/is-not-setup-via-query-false-positive 
PHP 7.4 excludes the arguments from stack traces by default.
 2020-05-04 09:49:50 +02:00
Nextcloud bot
43fefee847
[tx-robot] updated from transifex 2020-05-04 02:16:18 +00:00
Nextcloud bot
d2f165e448
[tx-robot] updated from transifex 2020-05-03 02:16:16 +00:00
Roeland Jago Douma
0c35aaba29
Fix OC_Image new resize functions 
Else the wrong mimetype might be set. Resulting in continious
regeneration of previews when browsing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-02 21:57:34 +02:00
Roeland Jago Douma
5ca0ffbcf0
Merge pull request #20779 from nextcloud/fix/noid/php-cs 
Comply with php-cs for CI
 2020-05-02 20:26:07 +02:00
Roeland Jago Douma
8910a1ffcb
Merge pull request #20762 from nextcloud/fix/20538/date-not-disabled 
Fix expiry datepicker allowing all dates
 2020-05-02 14:59:39 +02:00
Gary Kim
8dd23f9854
Fix expiry datepicker allowing all dates 
vue2-datepicker expects a `disabled-date` function
rather than `not-before` and `not-after` dates.

This commit updates it so that we now provide
vue2-datepicker with a `disabled-date` function.

Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-05-02 18:58:41 +08:00
Gary Kim
74d40233f5
Comply with php-cs 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-05-02 14:28:21 +08:00
Nextcloud bot
e77e0b0e2f
[tx-robot] updated from transifex 2020-05-02 02:16:32 +00:00
Roeland Jago Douma
24bb4a05c4
Merge pull request #20771 from nextcloud/fix/sharing-reactivity 
Do not process the same shares twice
 2020-05-01 19:15:38 +02:00
John Molakvoæ (skjnldsv)
31172a0cd9 Process shares only once, better debug and expiration date code 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-05-01 13:39:57 +00:00
Roeland Jago Douma
8c023a6579
Merge pull request #20767 from nextcloud/enh/argon2id-options 
Apply Argon2 options for Argon2id hashing as well
 2020-05-01 15:39:13 +02:00
Roeland Jago Douma
91487d8739
Merge pull request #20759 from nextcloud/up/education-bundle 
Update education bundle
 2020-05-01 13:34:39 +02:00
Roeland Jago Douma
80372a3ce1
Merge pull request #20716 from nextcloud/index-propertypath 
Add index to properties table
 2020-05-01 12:39:34 +02:00
Roeland Jago Douma
055fa998cd
Merge pull request #20761 from nextcloud/fix/owner_public 
Fix owner on publicownerwrapper
 2020-05-01 12:32:14 +02:00
MichaIng
229570badf
Apply Argon2 options for Argon2id hashing as well 
Signed-off-by: MichaIng <micha@dietpi.com>
 2020-05-01 11:42:13 +02:00
Roeland Jago Douma
b7b7b2872c
Fix owner on publicownerwrapper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 10:50:26 +02:00
Roeland Jago Douma
a41ad78408
Update education bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-01 09:52:58 +02:00
Roeland Jago Douma
c724eb24d5
Merge pull request #20380 from nextcloud/design/notification-mails 
Fix design and layout of notification mails
 2020-05-01 08:53:39 +02:00
Roeland Jago Douma
da9ad9ec78
Merge pull request #20291 from nextcloud/fix/user_menu_not_focused 
Fix focus for user actionmenu
 2020-05-01 08:42:06 +02:00
Nextcloud bot
9f448d864b
[tx-robot] updated from transifex 2020-05-01 02:16:47 +00:00
Jan-Christoph Borchardt
e981669e89
Fix notification mail tests 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2020-05-01 03:00:42 +02:00
Mario Danic
6e28c2807b
Add index to properties table 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2020-04-30 23:04:15 +02:00
GretaD
9b1f98f6fd Fix the keyboard tab for actionmenu 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-30 19:03:56 +00:00
Roeland Jago Douma
b2b8be83f8
Merge pull request #20538 from nextcloud/fix/20520/share-expire 
Fix share expiration date not shown
 2020-04-30 20:55:05 +02:00
Roeland Jago Douma
1a04033b19
Merge pull request #20725 from nextcloud/getDirectoryContent-fix-jail 
Fix getDirectoryContent implementation for Jail wrapper
 2020-04-30 20:34:52 +02:00
Jan-Christoph Borchardt
ae665e2175
Merge pull request #20744 from nextcloud/fix/public-design 
Fix public layout header title & description
 2020-04-30 19:02:32 +02:00
Daniel Kesselberg
1ef77ef948
composer run cs:fix 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-04-30 17:37:20 +02:00
Daniel Kesselberg
cba7219b25
PHP 7.4 excludes the arguments from stack traces by default. 
That leads to a false positive is not setup via query() but directly warning for every app because
the check does not work anymore.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-04-30 17:00:56 +02:00
Gary Kim
02b5ded840
Fix share expiration date not shown 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-04-30 22:35:52 +08:00
Roeland Jago Douma
0fc2dd85b5
Merge pull request #20611 from nextcloud/version/19/beta6 
19 beta 6
 2020-04-30 15:44:47 +02:00
Robin Appelman
4e6d3d1880
Fix getDirectoryContent implementation for Jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-30 15:27:09 +02:00
Roeland Jago Douma
8d5404b750
Merge pull request #20710 from nextcloud/fix/argon2-options-checks 
Fix Argon2 options checks
 2020-04-30 14:42:33 +02:00
Roeland Jago Douma
fa914f2e24
Merge pull request #20742 from nextcloud/fix/cs 
Run the cs fixer for green ci
 2020-04-30 14:41:50 +02:00
Morris Jobke
0f9b88c5a9
Merge pull request #20718 from nextcloud/fix/public_share_owner_activity_mess 
Add a wrapper to fall back to the share owner on public shares
 2020-04-30 13:46:13 +02:00
John Molakvoæ (skjnldsv)
6e79fb60d8
Fix public layout header title & description 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-04-30 13:32:28 +02:00
Joas Schilling
5b5550dbba
Merge pull request #20677 from nextcloud/followup/17718/scaling-user-provisioning 
Scaling user provisioning for subadmins with many groups
 2020-04-30 12:49:57 +02:00
Roeland Jago Douma
2139b29701
Merge pull request #20634 from nextcloud/legacy-avatar-placeholder 
Generate legacy image placeholder text by taking first letters
 2020-04-30 12:25:37 +02:00
Roeland Jago Douma
f6b435d0d9
Run the cs fixer for green ci 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-04-30 10:28:44 +02:00
MichaIng
ad60619655
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-04-30 10:18:46 +02:00