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

17103 commits

Author SHA1 Message Date
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
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
Nextcloud bot
9153ccdd19
[tx-robot] updated from transifex 2019-11-08 02:16:24 +00:00
Robin Appelman
8f6a11fdc0 actually return the quote when getting global storage info 
prevents 'undefined' index errors when 'include external storage in quota' is enabled

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-07 22:53:54 +00:00
Arthur Schiwon
46e7787c7d switch to Files Node API for zip generation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-07 10:04:12 +00:00
Nextcloud bot
5165e45074
[tx-robot] updated from transifex 2019-11-07 02:16:05 +00:00
Nextcloud bot
2a0b02ec9a
[tx-robot] updated from transifex 2019-11-05 02:15:55 +00:00
Nextcloud bot
6136a6c128
[tx-robot] updated from transifex 2019-11-04 02:15:35 +00:00
Nextcloud bot
4d686e278b
[tx-robot] updated from transifex 2019-11-03 02:16:14 +00:00
Roeland Jago Douma
bc6442c46b Do not show 'Get your own free account' on services under subscription 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 09:55:32 +00:00
Roeland Jago Douma
16c799c9f3 Fix DAV mimetype search 
Fixes #15048
Catches the case where a full mimetype is sumbitted in the where like
clause. Before we didn't catch this and it was just forwarded as is
causing invalid queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-29 07:35:33 +00:00
Roeland Jago Douma
f3af39ec78 Make sure limit is never negative 
There were some cases where a negative limit could be passed in. Which
would happily make the query explode.

This is just a quick hack to make sure it never is negative.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-28 13:00:28 +00:00
Roeland Jago Douma
7777c5ff1c Cleanup theming mess 
* Do not do translations in the constructor. This gets called to early
so there is no user yet. Which means we can't obtain the locale. Which
means we store the wrong translation instance.

* Same for the theming app magic. Just use the parent call when needed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-26 10:15:26 +00:00
Roeland Jago Douma
0449d1457c Don't pass in the locale as the language 
This messes with the translation of the date names etc.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-26 10:15:24 +00:00