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

17138 commits

Author SHA1 Message Date
Julius Härtl
07c37df91f Fix broken upgrade caused by undefined method call 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-01-07 07:53:36 +00:00
Nextcloud bot
06181e3527
[tx-robot] updated from transifex 2020-01-07 02:28:45 +00:00
Georg Ehrke
8bd52316dd Restore old behavior allowing to set custom appstore 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-01-06 14:30:41 +00:00
Nextcloud bot
cbde341301
[tx-robot] updated from transifex 2020-01-06 02:27:32 +00:00
Nextcloud bot
6488ca39f0
[tx-robot] updated from transifex 2020-01-05 02:30:43 +00:00
Nextcloud bot
5cf0f255bb
[tx-robot] updated from transifex 2020-01-04 02:27:54 +00:00
Nextcloud bot
6c6121ac0f
[tx-robot] updated from transifex 2019-12-31 02:27:55 +00:00
Nextcloud bot
acc0ac39b0
[tx-robot] updated from transifex 2019-12-29 02:28:02 +00:00
Nextcloud bot
6efa4bf068
[tx-robot] updated from transifex 2019-12-27 02:27:17 +00:00
Roeland Jago Douma
4f8589c894
Merge pull request #18488 from nextcloud/backport/18433/stable17 
[stable17] Use File Node API for more download cases, skip unreadable files
 2019-12-23 15:25:12 +01:00
Nextcloud bot
342fff64da
[tx-robot] updated from transifex 2019-12-23 02:27:42 +00:00
Nextcloud bot
847924758f
[tx-robot] updated from transifex 2019-12-22 02:28:45 +00:00
Nextcloud bot
4b02baba16
[tx-robot] updated from transifex 2019-12-21 02:26:45 +00:00
Nextcloud bot
dfcb6833b3
[tx-robot] updated from transifex 2019-12-20 02:26:38 +00:00
Arthur Schiwon
5bab0da935 when downloading from web, skip files that are not accessible 
* avoids a 403, but enables download of resources that are not restricted
* single file downloads still cause 403

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-19 16:55:54 +00:00
Arthur Schiwon
61de35c70e use Nodes API for zip streaming 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-19 16:55:54 +00:00
Julius Härtl
4d646a75f5 Use files node API for single file downloads 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-19 16:55:53 +00:00
Roeland Jago Douma
6f1219cd95
Merge pull request #18475 from nextcloud/backport/18456/stable17 
[stable17] Fix Office preview generation
 2019-12-19 10:33:03 +01:00
Nextcloud bot
ad76ed332c
[tx-robot] updated from transifex 2019-12-19 02:26:36 +00:00
Roeland Jago Douma
3d02121db3 Fix Office preview generation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-18 21:43:31 +00:00
Nextcloud bot
f6941a831c
[tx-robot] updated from transifex 2019-12-18 02:26:41 +00:00
Nextcloud bot
0dc8da1f24
[tx-robot] updated from transifex 2019-12-17 02:26:38 +00:00
Nextcloud bot
ad3ba247e1
[tx-robot] updated from transifex 2019-12-15 02:27:03 +00:00
Joas Schilling
790de0acef
Allow to specify apps that somethign is a dir 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:18 +01:00
Roeland Jago Douma
6955841c82
Fix detection of non extention types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-12 22:23:18 +01:00
Joas Schilling
848ca71730
Try more methods 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:18 +01:00
Joas Schilling
1dad2ddf39
Some more fixes in detecting the mimetype from the content 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:17 +01:00
Joas Schilling
5c9f503146
Allow to check for the mimetype by content only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-12 22:23:17 +01:00
Roeland Jago Douma
387d216214
Merge pull request #18355 from nextcloud/backport/17935/stable17 
[stable17] adding share type circles
 2019-12-12 10:49:12 +01:00
Maxence Lange
d6a276c57d using IShare:: 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-11 11:39:03 +00:00
Maxence Lange
1420cd5a7e adding share type circles 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-11 11:39:02 +00:00
Konrad Bucheli
f914b98860 handle IPv6 addresses with an explict incoming interface at the end (e.g fe80::ae2d:d1e7:fe1e:9a8d%enp2s0) 
Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch>
Signed-off-by: Konrad Bucheli <kb@open.ch>
 2019-12-11 10:34:21 +00:00
Roeland Jago Douma
e5772bdc3d
Merge pull request #18332 from nextcloud/backport/18312/stable17 
[stable17] Do not disable authentication apps
 2019-12-10 19:29:05 +01:00
Roeland Jago Douma
ac5f77a796
Merge pull request #18306 from nextcloud/backport/18184/stable17 
[stable17] Move overwritehost check to isTrustedDomain
 2019-12-10 14:54:11 +01:00
Roeland Jago Douma
c0becec8ad Do not disable authentication apps 
For #18249

If an app encounters an error during loading of app.php the app is
normally disabled. However. We should make sure that this doesn't happen
for authentication apps (looking at your user_saml).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 13:44:51 +00:00
Roeland Jago Douma
5623dff5ef
Merge pull request #18186 from nextcloud/backport/18149/stable17 
[stable17] delay creation of the cert bundle
 2019-12-10 13:38:58 +01:00
Nextcloud bot
babe78f20e
[tx-robot] updated from transifex 2019-12-10 02:16:53 +00:00
Julius Härtl
419df66251 Move overwritehost check to isTrustedDomain 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-09 20:39:00 +00:00
Nextcloud bot
4905e80d3f
[tx-robot] updated from transifex 2019-12-08 02:17:41 +00:00
Nextcloud bot
8052b32237
[tx-robot] updated from transifex 2019-12-07 02:16:47 +00:00
Nextcloud bot
a675bbb846
[tx-robot] updated from transifex 2019-12-06 02:17:10 +00:00
Nextcloud bot
adc4416043
[tx-robot] updated from transifex 2019-12-05 02:17:02 +00:00
Roeland Jago Douma
d4adc27792
Merge pull request #18221 from nextcloud/backport/17850/stable17 
[stable17] Mark "Talk" active on /call/token URLs
 2019-12-04 14:11:17 +01:00
Nextcloud bot
658c951d68
[tx-robot] updated from transifex 2019-12-04 09:24:22 +00:00
Joas Schilling
c17d86c081
Mark "Talk" active on /call/token URLs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-04 10:13:44 +01:00
Nextcloud bot
f7732ace10
[tx-robot] updated from transifex 2019-12-04 02:17:01 +00:00
Roeland Jago Douma
a7f596d241 Throw an invalid token exception is token is marked outdated 
This avoids hitting the backend with multiple requests for the same
token. And will help avoid quick LDAP lockouts.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-03 08:25:12 +00:00
Christoph Wurst
55b5e13e15
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-12-02 14:20:51 +01:00
Arthur Schiwon
ea3fc33beb
delay creation of the cert bundle 
fixes #18148

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-02 12:09:01 +01:00
Nextcloud bot
1e67be443d
[tx-robot] updated from transifex 2019-12-02 02:17:03 +00:00