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

50926 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
51dfddb9a4
Merge pull request #18375 from nextcloud/backport/18365/stable17 
[stable17] Bump the CRL
 2019-12-12 19:18:25 +01:00
Roeland Jago Douma
0872b391a3 Bump the CRL 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-12 14:40:03 +00:00
Roeland Jago Douma
feaf7581f6
Merge pull request #18366 from nextcloud/backport/18364/stable17 
[stable17] Support more IPv6 addresses in the RefreshWebcalJob
 2019-12-12 12:45:02 +01:00
Georg Ehrke
f2551e53fb Support more IPv6 addresses in the RefreshWebcalJob 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-12 10:06:05 +00: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
Nextcloud bot
903759df47
[tx-robot] updated from transifex 2019-12-12 02:26:42 +00:00
Roeland Jago Douma
1ee28f8414
Merge pull request #18358 from nextcloud/backport/18231/stable17 
[stable17]  Fix restoring shared versions
 2019-12-11 19:53:14 +01:00
Robin Appelman
48cd26ae4a
update tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-11 16:35:04 +01:00
Roeland Jago Douma
a34b05cb27
Merge pull request #18352 from nextcloud/backport/18341/stable17 
[stable17] handle IPv6 addresses with an explict incoming interface at the end
 2019-12-11 15:42:18 +01:00
Roeland Jago Douma
ba390f6943
Fix restoring shared versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-11 12:45:30 +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
624302d99a
Merge pull request #18337 from nextcloud/backport/18189/stable17 
[stable17] Sharee API GS fixes
 2019-12-11 07:51:44 +01:00
Nextcloud bot
1241380d79
[tx-robot] updated from transifex 2019-12-11 02:16:59 +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
John Molakvoæ (skjnldsv)
08c4b86678
Query lookup by default 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-12-10 16:15:00 +01:00
Roeland Jago Douma
31645c615f
Expose capability if the lookup server should be queried by default 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 15:58:00 +01:00
Roeland Jago Douma
05f12b8df4
Always do sharee lookup on lookup server in GS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 15:57:49 +01:00
Roeland Jago Douma
028ddde9e5
Merge pull request #18307 from nextcloud/backport/18299/stable17 
[stable17] Convert various columns in oc_mounts to bigint
 2019-12-10 14:54:25 +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
Georg Ehrke
c5feb6e5a7 Convert various columns in oc_mounts to bigint 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-09 20:39:45 +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
Roeland Jago Douma
9d8c0c262b
Merge pull request #18247 from nextcloud/backport/18241/stable17 
[stable17] Allow to unfavorite all files
 2019-12-09 21:27:47 +01:00
Nextcloud bot
0a1ec86ee5
[tx-robot] updated from transifex 2019-12-09 02:16:38 +00:00
Nextcloud bot
4905e80d3f
[tx-robot] updated from transifex 2019-12-08 02:17:41 +00:00
John Molakvoæ
2668ca73f3
[stable 17] Fix removing groups that have a slash in the name (#18257) 
[stable 17] Fix removing groups that have a slash in the name
 2019-12-07 09:46:28 +01:00
Gary Kim
e98b6f761d
Fix removing groups that have a slash in the name 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-12-07 10:18:13 +08: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
Roeland Jago Douma
a6f9a0809c
Merge pull request #18252 from nextcloud/17/bugfix/noid/tooltip-hide-date 
Hide the tooltip if the list row is rerendered
 2019-12-05 20:47:03 +01:00
Julius Härtl
7b6eb80f72
Hide the tooltip if the list row is rerendered 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-05 14:46:22 +01:00
Joas Schilling
17dc1bc0ba Allow to unfavorite all files 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-05 10:36:51 +00:00
Nextcloud bot
adc4416043
[tx-robot] updated from transifex 2019-12-05 02:17:02 +00:00
Roeland Jago Douma
f032b88c55
Merge pull request #18205 from nextcloud/stable17-backport/18120 
[stable17] Backport #18120
 2019-12-04 14:12:30 +01: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
Georg Ehrke
7aec7f6685
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-03 14:25:32 +01:00
Christoph Wurst
3d65375307
Merge pull request #18198 from nextcloud/backport/17443/stable17 
[stable17] Throw an invalid token exception is token is marked outdated
 2019-12-03 13:12:27 +01: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
Roeland Jago Douma
d1b0f0288a
Merge pull request #18189 from nextcloud/backport/17939/stable17 
[stable17] Handle token insert conflicts
 2019-12-03 07:49:03 +01:00
Nextcloud bot
1402d1b153
[tx-robot] updated from transifex 2019-12-03 02:16:56 +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