upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-16 01:09:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 31
54384 commits 689 branches 1185 tags 6.5 GiB
Commit graph

22732 commits

Author SHA1 Message Date
Morris Jobke
a169bd243f
Merge pull request #21972 from nextcloud/techdebt/noid/cleanup-phpunit-warnings 
Fix PHPUnit deprecation warnings
 2020-07-23 21:38:22 +02:00
Morris Jobke
173f8abc7e
Merge pull request #21628 from nextcloud/external-to-s3-trashbin-fix 
fix moving files from external storage to object store trashbin
 2020-07-23 21:35:18 +02:00
Simon Spannagel
d5b1297b55 Adjust tests to new e-mail layout 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2020-07-23 20:22:48 +02:00
Morris Jobke
1339ea15e2
Replace deprecated assertArraySubset with logic that does the same 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 17:11:29 +02:00
Morris Jobke
7e6c0ec284
Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 17:11:29 +02:00
Morris Jobke
0123cd0ae3
Use assertStringContainsString instead of assertContains on strings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 17:11:29 +02:00
Morris Jobke
f8955bd0d1
Merge pull request #21973 from nextcloud/techdebt/noid/fix-risky-2fa-backup-code-test 
Fix risky test in twofactor_backupcodes
 2020-07-23 17:11:10 +02:00
Robin Appelman
fcad692b4a
rollback cache rename if trashbin move fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 15:24:48 +02:00
Robin Appelman
5949849322
fix moving files from external storage to object store trashbin 
having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.

By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 15:24:44 +02:00
Morris Jobke
49f33ee632
Fix risky test in twofactor_backupcodes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 14:32:58 +02:00
Georg Ehrke
be20a494aa
Bump @nextcloud/vue from 2.2.1 to 2.3.0 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-07-23 14:12:28 +02:00
Roeland Jago Douma
ba39d7adde
Merge pull request #21963 from nextcloud/fix/sharing/respect_default_share_permissions 
Respect default share permissions
 2020-07-23 10:53:36 +02:00
Roeland Jago Douma
df1fa52ee5
Respect default share permissions 
Else we'll always create new shares with the max permissions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-07-23 09:30:42 +02:00
Julius Härtl
8af979f56d
Merge pull request #21957 from nextcloud/techdebt/noid/bootstrap-testing 
Use IBootstrap for the testing app
 2020-07-23 08:50:25 +02:00
Nextcloud bot
99d0ba5f7e
[tx-robot] updated from transifex 2020-07-23 02:17:03 +00:00
Morris Jobke
153337a5be
Use IBootstrap for the testing app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-22 22:28:04 +02:00
Roeland Jago Douma
b573014e2d
Merge pull request #21949 from nextcloud/smb-3.2.6 
update icewind/smb to 3.2.6
 2020-07-22 21:19:14 +02:00
Roeland Jago Douma
686f369d66
Merge pull request #21950 from nextcloud/bugfix/noid/wipe-translation 
Properly fetch translation for remote wipe confirmation dialog
 2020-07-22 21:10:28 +02:00
npmbuildbot[bot]
53088de52b Compile assets 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-22 18:45:33 +00:00
Morris Jobke
346f647962
Merge pull request #21870 from nextcloud/fix/bootstrap-context-container-interfaces 
Make the bootstrap context return ContainerInterface instances
 2020-07-22 20:38:50 +02:00
Julius Härtl
cf3dd5b6bd
Properly fetch translation for remote wipe confirmation dialog 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-22 20:32:01 +02:00
John Molakvoæ
c842678f0a
Merge pull request #21948 from nextcloud/bugfix/noid/accesibilityoca 
Load accessibilityoca script
 2020-07-22 17:47:33 +02:00
Georg Ehrke
387b1d7b13
Recompile JS assets 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-07-22 15:59:31 +02:00
Georg Ehrke
f217b11443
Fix breaking changes of nc/vue update 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-07-22 15:55:59 +02:00
Robin Appelman
7f7d361da2
update icewind/smb to 3.2.6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-22 14:25:33 +02:00
Julius Härtl
57075fa54d
Load accessibilityoca script 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-22 12:04:16 +02:00
Roeland Jago Douma
2166d718d9
Merge pull request #21904 from nextcloud/dependabot/npm_and_yarn/nextcloud/axios-1.3.3 
Bump @nextcloud/axios from 1.3.2 to 1.3.3
 2020-07-22 09:31:46 +02:00
Nextcloud bot
2e4cc6da17
[tx-robot] updated from transifex 2020-07-22 02:16:38 +00:00
Morris Jobke
7b250db60b
Merge pull request #21658 from nextcloud/trashbin-configurable-size 
allow admin to configure the max trashbin size
 2020-07-21 20:46:43 +02:00
Morris Jobke
7870ca0663
Use the proper IAppContainer and IServerContainer type hints to know which code runs with which container 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-21 20:44:05 +02:00
Christoph Wurst
91e7f12088
Adjust apps' code to use the ContainerInterface 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-07-21 20:43:18 +02:00
Morris Jobke
24889128cc
Merge pull request #21929 from nextcloud/bugfix/noid/encryption-transfer-user 
Encryption is ready if master key is enabled
 2020-07-21 13:42:26 +02:00
Julius Härtl
fc1596fada
Encryption is ready if master key is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-21 09:16:43 +02:00
Nextcloud bot
baa5e9fcfa
[tx-robot] updated from transifex 2020-07-21 02:17:06 +00:00
Morris Jobke
0716fb9c96
Merge pull request #21864 from nextcloud/techdebt/files-versions-psr-container 
Migrate files versions to the PSR container
 2020-07-21 00:17:17 +02:00
Morris Jobke
5fc51b33a3
Merge pull request #21865 from nextcloud/techdebt/settings-psr-container 
Migrate settigns to the PSR container
 2020-07-21 00:16:03 +02:00
dependabot-preview[bot]
f6fc63e415 Bump @nextcloud/axios from 1.3.2 to 1.3.3 
Bumps [@nextcloud/axios](https://github.com/nextcloud/nextcloud-axios) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/nextcloud/nextcloud-axios/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-axios/compare/v1.3.2...v1.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-20 15:29:45 +00:00
Morris Jobke
09e6b26bdd
Merge pull request #21875 from nextcloud/techdebt/deprecate-ilogger 
Deprecate ILogger in favor of the PSR-3 logger
 2020-07-20 16:45:14 +02:00
Morris Jobke
8a229d6035
Merge pull request #21862 from nextcloud/techdebt/files-sharing-psr-container 
Migrate files sharing to the PSR container
 2020-07-20 16:41:35 +02:00
Morris Jobke
f88a4b5604
Merge pull request #21866 from nextcloud/techdebt/ldap-psr-container 
Migrate LDAP to the PSR container
 2020-07-20 16:28:54 +02:00
Morris Jobke
5563a952ce
Merge pull request #21846 from nextcloud/dependabot/npm_and_yarn/p-limit-3.0.2 
Bump p-limit from 2.3.0 to 3.0.2
 2020-07-20 15:00:45 +02:00
dependabot-preview[bot]
30a18f6dd9 Bump p-limit from 2.3.0 to 3.0.2 
Bumps [p-limit](https://github.com/sindresorhus/p-limit) from 2.3.0 to 3.0.2.
- [Release notes](https://github.com/sindresorhus/p-limit/releases)
- [Commits](https://github.com/sindresorhus/p-limit/compare/v2.3.0...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-20 11:40:20 +00:00
John Molakvoæ (skjnldsv)
6fcd075730
Use DOMContentLoaded and fix sharebymail loading issue 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-07-20 12:42:08 +02:00
Nextcloud bot
d925c45373
[tx-robot] updated from transifex 2020-07-19 02:17:06 +00:00
Nextcloud bot
9f50b19a4d
[tx-robot] updated from transifex 2020-07-18 02:16:57 +00:00
Roeland Jago Douma
79c677e26d
Merge pull request #21859 from nextcloud/techdebt/dav-psr-container 
Migrate DAV to the PSR container
 2020-07-17 08:21:48 +02:00
Nextcloud bot
2c79083f27
[tx-robot] updated from transifex 2020-07-17 02:17:12 +00:00
Roeland Jago Douma
514dc45468
Merge pull request #21855 from p5n/master 
fix typo in revokeShare()
 2020-07-16 19:58:49 +02:00
Christoph Wurst
b3b856c9db
Migrate contacts interaction to the PSR-3 logger 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-07-16 19:38:20 +02:00
Christoph Wurst
35e966c38d
Migrate LDAP to the PSR container 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-07-16 15:57:17 +02:00