wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
51677 commits 157 branches 562 tags 714 MiB
Commit graph

4253 commits

Author SHA1 Message Date
Roeland Jago Douma
eb8ca3783c
Viewer should be always enabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 20:06:30 +01:00
Joas Schilling
059968e1c7
Pick a shorter name for the transfer ownership table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 11:01:26 +01:00
Roeland Jago Douma
72155009fa
Merge pull request #18184 from nextcloud/bugfix/noid/is-trusted-domain 
Move overwritehost check to isTrustedDomain
 2019-12-09 21:37:22 +01:00
Daniel Kesselberg
29575c4d36
Move custom definition logic into method 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:10:19 +01:00
Daniel Kesselberg
64aba49461
Ensure that we don't merge broken json. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:09:43 +01:00
Daniel Kesselberg
0016480370
Decouple resource provider registration 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-07 22:04:07 +01:00
Julius Härtl
d05f131929
Move overwritehost check to isTrustedDomain 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-07 09:53:06 +01:00
Roeland Jago Douma
04c2b5fcb1
Merge pull request #18130 from nextcloud/bugfix/noid/prevent-creating-users-with-existing-files 
Prevent creating users with existing files
 2019-12-05 10:30:00 +01:00
Joas Schilling
6004f62085
I love unit tests that mock unnecessary stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-04 15:22:02 +01:00
Roeland Jago Douma
76b78edd40
Merge pull request #17833 from nextcloud/propagator-no-negative-sizes 
dont set folder size to negative values during propagation
 2019-12-04 11:49:26 +01:00
Roeland Jago Douma
1d707cc349
Merge pull request #18028 from nextcloud/enhancement/user-create-events 
Add typed create user events
 2019-12-03 08:57:51 +01:00
Christoph Wurst
cc80339b39
Add typed create user events 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-03 08:03:57 +01:00
John Molakvoæ (skjnldsv)
5cb11ca642
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-02 13:08:43 +01:00
Julius Härtl
fc51425790
Adjust DirectEditing test to PHPUnit8 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-28 10:59:22 +01:00
Roeland Jago Douma
4173d9d749
Merge pull request #17625 from nextcloud/enh/noid/direct-editing 
Direct editing API to allow file editing using a one-time token
 2019-11-28 08:49:57 +01:00
Roeland Jago Douma
62dc320191
Merge pull request #17725 from nextcloud/enh/share_exp_internal 
Allow internal shares to have a default expiration date
 2019-11-28 08:37:19 +01:00
Roeland Jago Douma
669302e570
Merge pull request #18064 from nextcloud/feature/php74 
Add php7.4 support
 2019-11-28 08:36:10 +01:00
Julius Härtl
e18397284b
Use person icon for personal settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 21:06:14 +01:00
Julius Härtl
329e8c2604
Add mimetype to creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:44 +01:00
Julius Härtl
9a2694fcb0
Code style fixes and cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:40 +01:00
Roeland Jago Douma
0e14bdc0d0
remove test case 
Because we test very naively we matched also on def in default...

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
469c06be15
TO REVERT LATER: disable decimaltest from LegacyDBTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:28 +01:00
Roeland Jago Douma
b656693db2
TO REVERT LATER: disable tests in LargeFileHelperGetFileSizeTest 
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
078f4efb20
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 14:51:14 +01:00
Julius Härtl
c8d3e32190
Direct editing token tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 14:36:20 +01:00
Roeland Jago Douma
ec14d95292
Fix lockprivider test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
8d4346d656
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
bc16b05243
Fix signCoretests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
305481688b
SignApp fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
ef4b59d341
More fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:42 +01:00
Roeland Jago Douma
799f58391e
More fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
3aa5f105fa
Fix more tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
385ec2947d
Skip redis if not configured 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +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
0532f8116d
Merge pull request #18019 from nextcloud/enhancement/password-policy-events 
Add typed events for password_policy
 2019-11-27 11:11:17 +01:00
blizzz
d2f9deba51
Merge pull request #17834 from nextcloud/enh/noid/generic-event-replacement-tk2 
Public API's GenericEvent replacement (take 2)
 2019-11-27 10:50:07 +01:00
Christoph Wurst
1a886b1472
Add typed events for password_policy 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-27 09:56:12 +01:00
Roeland Jago Douma
d09f8c7423
Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling 
Handle token insert conflicts
 2019-11-26 19:47:59 +01:00
Arthur Schiwon
fc16b09a2c
Files first to use own GenericEvent 
* those are added to 18 only anyway :)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-26 14:48:59 +01:00
Roeland Jago Douma
b607e3e6f4
Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool 
Make isXXX available for bool properties only
 2019-11-26 12:25:36 +01:00
Christoph Wurst
0299ea0a96
Handle token insert conflicts 
Env-based SAML uses the "Apache auth" mechanism to log users in. In this
code path, we first delete all existin auth tokens from the database,
before a new one is inserted. This is problematic for concurrent
requests as they might reach the same code at the same time, hence both
trying to insert a new row wit the same token (the session ID). This
also bubbles up and disables user_saml.

As the token might still be OK (both request will insert the same data),
we can actually just check if the UIDs of the conflict row is the same
as the one we want to insert right now. In that case let's just use the
existing entry and carry on.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-26 12:07:12 +01:00
Robin Appelman
74c6beb603
dont set folder size to negative values during propagation 
normally this shouldn't be a problem, but cache/storage desync might cause this
so this adds some failsafe to ensure we dont corrupt the cache further

the minimum value is set to -1 instead of 0 in order to triger a background scan
on the folder and figure out the size properly

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +01:00
Robin Appelman
9e450d727a
add LEAST and GREATER to db function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +01:00
blizzz
b1dffc5c2d
Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-result 
take group creation result into consideration
 2019-11-25 17:16:40 +01:00
Arthur Schiwon
7b1eedb11e
take group creation result into consideration 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-25 14:01:20 +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
3c1bcd551d
Fix the tests after #18029 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-21 22:31:45 +01:00
Roeland Jago Douma
5c4b2a2436
Merge pull request #18029 from nextcloud/feature/public-post-login-event 
Make the post login event public
 2019-11-21 12:39:42 +01:00
Roeland Jago Douma
da25ed997e
Do not check for updates if we have no internet 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 19:30:59 +01:00