upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
54663 commits 857 branches 1195 tags 7.2 GiB
Commit graph

54663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
5a064ec28b
Fix typo in error message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-19 20:42:27 +02:00
Julius Härtl
00e62171d2
Test for locking state in key generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-14 07:58:41 +02:00
Julius Härtl
36cfdd320b
Harden key generation 
There might be cases where multiple requests trigger the key generation
at the same time and the instance ends up with a non-fitting
public/private key pair. Therefore the whole key generation should be
locked. Other than that this makes sure that user key generation return
values are properly validated.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-14 07:58:40 +02:00
Morris Jobke
ed46115593
Merge pull request #22235 from nextcloud/fix/22217/fix-naming-of-app-config-option 
Fix name of app config option to properly reflect what it does
 2020-08-13 14:49:01 +02:00
Morris Jobke
93ba8faabc
Fix name of app config option to properly reflect what it does 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-13 13:34:31 +02:00
Morris Jobke
89f92e3c22
Merge pull request #22229 from nextcloud/bugfix/noid/dashboard-outdated-bundles 
Bump outdated dashboard bundles
 2020-08-13 10:58:54 +02:00
Morris Jobke
0b856329eb
Merge pull request #22202 from nextcloud/enh/noid/cleanup-servercontainer 
Use autowiring where possible in server container
 2020-08-13 10:55:48 +02:00
Julius Härtl
ac95e069c4
Bump outdated dashboard bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-13 10:10:40 +02:00
Roeland Jago Douma
34cd49827c
Merge pull request #21788 from nextcloud/debt/noid/unused-method 
Remove unused method uploadFile
 2020-08-13 09:40:38 +02:00
Morris Jobke
3c56922444
Merge pull request #22205 from nextcloud/activity-settings-cleanup 
merge file activity settings into a single 'favorite changed' item
 2020-08-13 08:15:06 +02:00
Daniel Kesselberg
ba3a855ad8
Remove unused method uploadFile 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-13 08:02:28 +02:00
Morris Jobke
df4bcd616f
Add @deprecated labels for server DI containter aliases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-13 07:43:37 +02:00
Morris Jobke
725fecee34
Merge pull request #21344 from nextcloud/fix/twofactor-cleanup-event 
Emit an event for every disabled 2FA provider during cleanup
 2020-08-13 07:25:01 +02:00
Morris Jobke
894640206e
Use registerDeprecatedAlias for non-namespaced aliases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-13 05:43:38 +02:00
Morris Jobke
2f2252cfba
Use autowiring where possible in server container 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-13 05:43:36 +02:00
Nextcloud bot
3a39f2ae91
[tx-robot] updated from transifex 2020-08-13 02:16:38 +00:00
Robin Appelman
5f58cefbd7
merge file activity settings into a single 'favorite changed' item 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-13 00:01:34 +02:00
Robin Appelman
a11769e0e3
move share notifcation settings to files group 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-13 00:01:30 +02:00
Morris Jobke
f49de1d775
Merge pull request #22206 from nextcloud/enh/noid/tests-recent-contact-mapper 
Add some tests for RecentContactMapper
 2020-08-12 21:09:18 +02:00
Morris Jobke
6ca359a745
Merge pull request #22217 from nextcloud/enh/noid/disable-admin-changed-email-appconfig 
Add app config option to disable "Email was changed by admin" email
 2020-08-12 16:46:00 +02:00
Morris Jobke
55e79b8a6a
Merge pull request #22199 from nextcloud/techdebt/noid/PHPUnit_Framework_MockObject_MockObject 
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to …
 2020-08-12 13:55:36 +02:00
Morris Jobke
234b510652
Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-12 13:55:19 +02:00
Morris Jobke
53fab3fe5f
Add app config option to disable "Email was changed by admin" email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-12 12:27:43 +02:00
Daniel Kesselberg
1fc1376175
Add some tests for RecentContactMapper 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-12 12:16:25 +02:00
blizzz
4c1f13c569
Merge pull request #22211 from nextcloud/fix/noid/rm-useless-log 
remove logging message carrying no valuable information
 2020-08-12 09:15:44 +00:00
Arthur Schiwon
5257efc5f2
remove logging message carrying no valuable information 
the exception caught is not an error, but due to valid configuration and
code flow is expecting this. For an admin it is confusing, and it carries
no information worth for debugging.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-12 09:10:23 +02:00
Morris Jobke
15d70859e6
Merge pull request #22196 from nextcloud/enh/sse/do_not_concatenate_ints 
SSE enhancement of file signature
 2020-08-12 09:09:04 +02:00
Nextcloud bot
ad6a4219a2
[tx-robot] updated from transifex 2020-08-12 02:16:50 +00:00
blizzz
88fcc05e4f
Merge pull request #21559 from nextcloud/fix/noid/ldap-group-shortcut-ad 
shortcut in reading nested group members when IN_CHAIN is available
 2020-08-11 22:22:37 +00:00
Morris Jobke
138f47a1b9
Merge pull request #22162 from nextcloud/enh/noid/password-generator-sharebymail 
ShareByMail: Migrate to GenerateSecurePasswordEvent
 2020-08-11 21:59:21 +02:00
Daniel Kesselberg
4dd507675c
Generate password by password_policy app 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-11 21:58:51 +02:00
Jan C. Borchardt
50fdd45e9b
Merge pull request #22143 from nextcloud/design/dashboard-design 
Dashboard design enhancements
 2020-08-11 19:37:14 +02:00
Roeland Jago Douma
9975b80d41
SSE enhancement 
Do not blind concatenate ints. Lets add a _ between them. So that we can
distrinquis them properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-11 19:26:41 +02:00
Arthur Schiwon
7eb6d8df0a
do not flip available state to unavailable, allow empty results 
- the detection relies that the first, requested result is not empty
- it might be empty though – groups without members
- protect switching from available to unavailable
  - switching the other way around was also not envisaged either

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-11 19:03:27 +02:00
Arthur Schiwon
7ea262dba0
LDAP: shortcut in reading nested group members when IN_CHAIN is available 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-11 18:22:11 +02:00
Jan C. Borchardt
4507c362cd
Dashboard: Add photo credit 
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
 2020-08-11 16:45:02 +02:00
Roeland Jago Douma
a7875c2431
Merge pull request #22151 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1 
Bump webpack-merge from 5.0.9 to 5.1.1
 2020-08-11 14:33:31 +02:00
Roeland Jago Douma
f4765651db
Merge pull request #22190 from nextcloud/fix/noid/log-rotate-size 
Fix default log_rotate_size in config.sample.php
 2020-08-11 14:08:36 +02:00
Morris Jobke
7badda361d
Fix default log_rotate_size in config.sample.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-11 14:00:26 +02:00
Morris Jobke
8fc877ff7d
Merge pull request #22117 from nextcloud/activity-settings-grouping 
allow grouping of activity settings
 2020-08-11 11:24:23 +02:00
Morris Jobke
5d3ecfdffd
Merge pull request #21775 from nextcloud/bugfix/noid/transfer-object-storage 
Do not exit if available space cannot be determined on file transfer
 2020-08-11 11:08:03 +02:00
Jan C. Borchardt
227b4761b8
Dashboard: Fix wording issue on greetings 
Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>
 2020-08-11 10:12:25 +02:00
Morris Jobke
85aded7f19
Merge pull request #22148 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.5.2 
Bump bootstrap from 4.5.0 to 4.5.2
 2020-08-11 09:46:23 +02:00
Morris Jobke
548576ec10
Merge pull request #22176 from nextcloud/debt/noid/table-render-too-many-arguments 
Remove unexpected argument
 2020-08-11 09:44:28 +02:00
Morris Jobke
21e0523c07
Merge pull request #22167 from nextcloud/debt/noid/coverage-filter 
Exclude apps/*/tests for coverage calculation
 2020-08-11 09:43:19 +02:00
Morris Jobke
dffa155fc1
Merge pull request #22175 from nextcloud/fix/noid/warning-continue-break 
use break not continue in switch to avoid warning
 2020-08-11 09:41:36 +02:00
Morris Jobke
bc4df68e56
Merge pull request #22169 from nextcloud/enh/noid/prefer-typed-events 
Prefer typed event over string based ones
 2020-08-11 09:34:48 +02:00
Morris Jobke
4e297d7a97
Use constant instead of magic number 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-11 08:14:03 +02:00
Julius Härtl
cb2f5a829e
Do not exit if available space cannot be determined on file transfer 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-11 08:14:03 +02:00
Julius Härtl
81ba90a0fe
Dynamically generate background image url 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-11 07:54:34 +02:00