mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
50,785 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

17115 Commits

Author SHA1 Message Date
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
Nextcloud bot 611e6a0f7d
[tx-robot] updated from transifex 2019-11-29 02:17:03 +00:00
Nextcloud bot c75cc61226
[tx-robot] updated from transifex 2019-11-28 02:17:04 +00:00
Nextcloud bot 8cb7149de8
[tx-robot] updated from transifex 2019-11-27 02:16:34 +00:00
Nextcloud bot 902c75a1a9
[tx-robot] updated from transifex 2019-11-26 02:16:05 +00:00
Roeland Jago Douma a0a9f702b0
Merge pull request #18075 from nextcloud/backport/17696/stable17 
[stable17] Remove objectstore credentials
 2019-11-25 08:38:21 +01:00
Nextcloud bot 2d0fa72171
[tx-robot] updated from transifex 2019-11-23 02:16:17 +00:00
Daniel Kesselberg 956c459465 Add information about credentials 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:16 +00:00
Daniel Kesselberg 33dc7333a6 Remove objectstore credentials 
Also remove the username for Swift v2 and add todo for unclear keys.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:16 +00:00
Daniel Kesselberg d77d94b1a0 Remove objectstore credentials 
S3: key and secret
Swift v3: user.name and user.password

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-22 13:27:15 +00:00
Nextcloud bot 99420445cc
[tx-robot] updated from transifex 2019-11-22 02:16:26 +00:00
Roeland Jago Douma 830554c1a7
Merge pull request #18036 from nextcloud/backport/18003/stable17 
[stable17] Do not check for updates if we have no internet
 2019-11-21 07:48:49 +01:00
Roeland Jago Douma 1d5ce9907f
Merge pull request #18043 from nextcloud/backport/18009/stable17 
[stable17] Fix installing with MySQL 8.0.4+
 2019-11-21 07:48:03 +01:00
Nextcloud bot 02df65a102
[tx-robot] updated from transifex 2019-11-21 02:16:11 +00:00
Joas Schilling f3ad49b866 Fix installing with MySQL 8.0.4+ 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-20 20:52:06 +00:00
Roeland Jago Douma d95a54b359 Do not check for updates if we have no internet 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 19:55:19 +00:00
Nextcloud bot 9d5e7a4dd4
[tx-robot] updated from transifex 2019-11-20 02:16:28 +00:00
Nextcloud bot 1986315b32
[tx-robot] updated from transifex 2019-11-19 02:17:57 +00:00
Nextcloud bot c2e3fcddb5
[tx-robot] updated from transifex 2019-11-18 02:16:06 +00:00
Arthur Schiwon a9c61b4ed7 pass through ServerNotAvailableException on app init 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-14 21:01:02 +00:00
Nextcloud bot d5fc345d70
[tx-robot] updated from transifex 2019-11-14 02:16:24 +00:00
Thibault Coupin 4a09899ad8 Fix reshare with circle 
Signed-off-by: Thibault Coupin <thibault.coupin@gmail.com>
 2019-11-12 15:28:19 +00:00
Roeland Jago Douma c8cc98be03
Merge pull request #17851 from nextcloud/backport/17830/stable17 
[stable17] actually return the quote when getting global storage info
 2019-11-12 08:11:53 +01:00
Nextcloud bot f6469c04d9
[tx-robot] updated from transifex 2019-11-12 02:16:22 +00:00