8033655a5a
Migrate encryption to the PSR container
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-07 15:34:06 +02:00
d9015a8c94
Format code to a single space around binary operators
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-05 20:25:24 +02:00
fe30bfd232
Update autloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-24 14:59:41 +02:00
48761481eb
Bump versions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-18 09:16:45 +02:00
869f3f5895
[tx-robot] updated from transifex
2020-09-15 10:48:26 +00:00
40e2339151
[tx-robot] updated from transifex
2020-08-28 02:16:21 +00:00
2a054e6c04
Update the license headers for Nextcloud 20
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-08-24 14:54:25 +02:00
69482049e6
[tx-robot] updated from transifex
2020-08-21 02:16:43 +00:00
da584462d1
Merge pull request #22018 from nextcloud/bugfix/noid/harden-key-generation
...
Harden SSE key generation
2020-08-19 20:42:34 +02:00
5a064ec28b
Fix typo in error message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-08-19 20:42:27 +02:00
2bbb848c31
Add legacy scanning command
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-19 15:45:45 +02:00
8928bbe969
Make legacy cipher opt in
...
* Systems that upgrade have this enabled by default
* New systems disable it
* We'll have to add some wargning in the setup checks if this is enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-19 15:45:45 +02:00
6f8147b18f
Fix some MissingDocblockType or InvalidDocblock warnings.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-08-14 15:10:48 +02:00
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
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
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
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
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
3e994c6ba0
[tx-robot] updated from transifex
2020-07-31 02:17:21 +00:00
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
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
d925c45373
[tx-robot] updated from transifex
2020-07-19 02:17:06 +00:00
09b9f94c38
[tx-robot] updated from transifex
2020-07-07 02:16:31 +00:00
0825530a1b
[tx-robot] updated from transifex
2020-07-03 02:17:12 +00:00
d7c0b9cced
Also always return in app commands
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-26 15:12:11 +02:00
99e14b5ada
[tx-robot] updated from transifex
2020-06-09 02:15:56 +00:00
0f4de3d353
[tx-robot] updated from transifex
2020-06-01 02:16:00 +00:00
3b519f776a
[tx-robot] updated from transifex
2020-05-22 02:17:20 +00:00
70114cfb91
[tx-robot] updated from transifex
2020-05-10 02:15:59 +00:00
af1dd9f152
Bump app versions and requirements
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-05-07 10:29:04 +02:00
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
39f6f1ba34
[tx-robot] updated from transifex
2020-04-25 02:16:01 +00:00
f0c1041d2e
[tx-robot] updated from transifex
2020-04-21 02:16:40 +00:00
078ac97939
[tx-robot] updated from transifex
2020-04-16 02:17:30 +00:00
6187cea304
[tx-robot] updated from transifex
2020-04-13 02:19:45 +00:00
734c62bee0
Format code according to PSR2
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +02:00
28f8eb5dba
Add visibility to all constants
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
1584c9ae9c
Add visibility to all methods and position of static keyword
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:51:06 +02:00
caff1023ea
Format control structures, classes, methods and function
...
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
14c996d982
Use elseif instead of else if
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
44577e4345
Remove trailing and in between spaces
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
42625a46be
Remove spaces after method or function call
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:05:56 +02:00
afbd9c4e6e
Unify function spacing to PSR2 recommendation
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
41b5e5923a
Use exactly one empty line after the namespace declaration
...
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
2fbad1ed72
Fix (array) indent style to always use one tab
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
1a9330cd69
Update the license headers for Nextcloud 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
89710bbdcf
[tx-robot] updated from transifex
2020-03-29 02:20:14 +00:00
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
...
Remove unused imports
2020-03-27 17:14:08 +01:00
b80ebc9674
Use the short array syntax, everywhere
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
2ee65f177e
Use the shorter phpunit syntax for mocked return values
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:21:27 +01:00
74936c49ea
Remove unused imports
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +01:00
150f39ed50
Update autoloaders for composer v1.10.1
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-19 09:48:49 +01:00
4a21ce27ff
[tx-robot] updated from transifex
2020-03-19 02:20:00 +00:00
4a019ab04c
[tx-robot] updated from transifex
2020-03-09 02:18:09 +00:00
0e7163c7c1
[tx-robot] updated from transifex
2020-02-26 02:18:20 +00:00
921253033a
[tx-robot] updated from transifex
2020-02-24 02:19:17 +00:00
d3f2bda90c
[tx-robot] updated from transifex
2020-02-22 02:18:42 +00:00
750181d283
[tx-robot] updated from transifex
2020-02-03 02:16:46 +00:00
69d2893a75
[tx-robot] updated from transifex
2020-01-31 02:17:52 +00:00
a4a05ee03d
[tx-robot] updated from transifex
2020-01-30 02:18:12 +00:00
2a01308d5c
[tx-robot] updated from transifex
2020-01-23 02:18:24 +00:00
8728eab9d7
Fix app updates
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-21 14:00:58 +01:00
53c37a170d
[tx-robot] updated from transifex
2020-01-21 02:17:28 +00:00
434fd438d9
[tx-robot] updated from transifex
2020-01-19 02:17:21 +00:00
a61bad6ede
[tx-robot] updated from transifex
2020-01-18 02:18:30 +00:00
797b603a1f
[tx-robot] updated from transifex
2020-01-04 02:27:44 +00:00
1d8da461d5
[tx-robot] updated from transifex
2019-12-23 02:27:33 +00:00
c81e05db98
[tx-robot] updated from transifex
2019-12-22 02:28:34 +00:00
8f403b66d1
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-12-09 14:29:22 +01:00
5bf3d1bb38
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
4cbaf69bc3
[tx-robot] updated from transifex
2019-12-03 02:16:46 +00:00
669302e570
Merge pull request #18064 from nextcloud/feature/php74
...
Add php7.4 support
2019-11-28 08:36:10 +01:00
563f9153a2
[tx-robot] updated from transifex
2019-11-28 02:16:54 +00:00
9761822aeb
TO REVERT LATER: fix UserHooksTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:28 +01:00
3a7cf40aaa
Mode to modern phpunit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:18 +01:00
c007ca624f
Make phpunit8 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:41 +01:00
123c4aa4e0
[tx-robot] updated from transifex
2019-11-26 02:15:57 +00:00
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
0d7f55aae9
[tx-robot] updated from transifex
2019-11-22 02:16:16 +00:00
afa0f2c0d8
[tx-robot] updated from transifex
2019-11-20 02:16:19 +00:00
13960b69da
Merge pull request #17509 from nextcloud/fix/application-singleton
...
Fix Application instances created multiple times
2019-11-04 18:18:32 +01:00
e517ca0530
[tx-robot] updated from transifex
2019-11-04 02:15:26 +00:00
d633b451df
[tx-robot] updated from transifex
2019-10-24 02:15:26 +00:00
12c13b86d8
fixup! Do not create Application instances directly
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-14 22:59:16 +02:00
543190f8b3
Do not create Application instances directly
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-11 08:33:09 +02:00
74dcd84ee8
[tx-robot] updated from transifex
2019-10-02 02:15:09 +00:00
61d22ff6cf
[tx-robot] updated from transifex
2019-09-24 02:14:41 +00:00
16d47b5928
Fix wrongly mixed mock objects in encryption tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-15 12:04:28 +02:00
365f30b05b
[tx-robot] updated from transifex
2019-09-08 02:16:42 +00:00
04ef434af0
Development is 18 now!
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-05 11:26:35 +02:00
cdd491c706
[tx-robot] updated from transifex
2019-08-28 02:15:26 +00:00
9249a810fb
[tx-robot] updated from transifex
2019-07-21 02:15:10 +00:00
1bbb26e060
[tx-robot] updated from transifex
2019-06-17 02:13:59 +00:00
85767660ba
[tx-robot] updated from transifex
2019-06-14 02:14:26 +00:00
c3f779b97d
[tx-robot] updated from transifex
2019-05-28 02:13:42 +00:00
f2885c171f
[tx-robot] updated from transifex
2019-05-22 02:13:52 +00:00
201fc9fbcf
[tx-robot] updated from transifex
2019-04-24 00:12:32 +00:00
d3332f516f
[tx-robot] updated from transifex
2019-04-14 00:13:26 +00:00
4c19b3b2c6
Bump versions of server and the requirements of apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-04-11 14:02:23 +02:00
acba430246
[tx-robot] updated from transifex
2019-04-08 00:14:18 +00:00
Christoph Wurst
Roeland Jago Douma
Joas Schilling
Nextcloud bot
Morris Jobke
Daniel Kesselberg
Julius Härtl
John Molakvoæ (skjnldsv)
Christoph Wurst
Roeland Jago Douma
John Molakvoæ