upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-10 06:15:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 57
62829 commits 673 branches 1182 tags 8.2 GiB
Commit graph

64 commits

Author SHA1 Message Date
Carl Schwan
719dbafd13
Add support for Delegation Settings for more apps 
* This adds support for the sharing, groupware, theming and user_ldap
  app
* This adds some code who disapeared during a rebase in the initial
  delegation PR (provisioning_api)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-15 18:41:00 +02:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Joas Schilling
1029abc8f6
More cleaning after auto-add removal 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-04-27 08:13:47 +02:00
Christoph Wurst
1e0eaa25d0
Drop all dead packages 
Apparently we have plenty of leftover of previous sub-dependencies.
Composer automatically dumps those with any future dependency update, so
I'm dropping them in an atomic step.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-23 09:11:23 +01:00
Joas Schilling
8027dcbc6f
Don't leave cursors open when tests fail 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-09 12:28:17 +01:00
Christoph Wurst
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
Christoph Wurst
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
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
Christoph Wurst
cb057829f7
Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Christoph Wurst
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
Christoph Wurst
afbd9c4e6e
Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
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
Christoph Wurst
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
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Roeland Jago Douma
924b3298cf
TO REVERT LATER: disable some DbHandlerTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
3a7cf40aaa
Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +01:00
Roeland Jago Douma
c007ca624f
Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
372f3d2a60
Remove deprecated functions from SecureRandom 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-07 19:33:32 +01:00
Bjoern Schiessle
0e0cfa0fa1
improve error reporting and move format parameter to the options 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-25 13:53:56 +02:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Roeland Jago Douma
2c2e1c4c7a
Catch the errors related to untrusted self signed certificates for federation 
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 18:14:01 +01:00
Roeland Jago Douma
d24b6866b1
Actually set the status so we don't cause another exception 
* And add tests so I don't mess up again

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 16:37:54 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Roeland Jago Douma
bc54e6ff7c
Use ITimeFactory 
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 11:23:40 +02:00
Bjoern Schiessle
3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
80c08e8fd0
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
06b9e58081
expire requestSharedSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
51d85eb2f8
expire getShareadSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:51 +02:00
Bjoern Schiessle
821e287805
adjust existing tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle
4531b4a81d
only execute code if exception was thrown by the corresponding controller 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-24 11:06:44 +01:00
Bjoern Schiessle
7df5c5db2d
don't add server automatically to trusted server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-17 18:08:45 +01:00
Roeland Jago Douma
62485ed08f
Fix deprecated getMock call in Federation app 2016-08-31 20:54:17 +02:00
Roeland Jago Douma
b6520827f7
Use function parameters 2016-08-28 11:40:58 +02:00
Roeland Jago Douma
16ff207465
Move OCSAuthAPI to AppFramework 
* Convert class
* Convert routes
* Convert tests
 2016-08-28 11:40:53 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock 
CI uses an older PHPUnit
 2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Bjoern Schiessle
50044fb792
improve federation error messages 2016-08-09 10:24:45 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Morris Jobke
9107fd6cd6
fix federation strings 2016-06-20 13:13:37 +02:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Joas Schilling
a6b4ba9ba1
Fix errors in the tests 2016-05-19 09:48:00 +02:00
Joas Schilling
da332c134e
Move federation tests to PSR-4 2016-05-19 09:48:00 +02:00
Joas Schilling
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Bjoern Schiessle
7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Bjoern Schiessle
eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Bjoern Schiessle
cc397da1be Remove background job if the server accepted to ask for the shared secret 
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
 2016-02-15 18:03:10 +01:00