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

49798 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
c3dc9b7e84
Merge pull request #17852 from nextcloud/backport/17830/stable16 
[stable16] actually return the quote when getting global storage info
 2019-11-08 09:32:29 +01:00
Nextcloud bot
04e6470b2f
[tx-robot] updated from transifex 2019-11-08 02:16:32 +00:00
Robin Appelman
555900a0d2 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:55:01 +00:00
Roeland Jago Douma
0e57eabfa0
Merge pull request #17827 from nextcloud/version/16.0.6/final 
16.0.6
 2019-11-07 23:19:58 +01:00
Roeland Jago Douma
d171d1aff8
Merge pull request #17841 from nextcloud/backport/17822/stable16 
[stable16] switch to Files Node API for zip generation
 2019-11-07 12:59:33 +01:00
Arthur Schiwon
d0db369464 switch to Files Node API for zip generation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-07 10:04:59 +00:00
Nextcloud bot
00b838ca6c
[tx-robot] updated from transifex 2019-11-07 02:16:14 +00:00
Roeland Jago Douma
47e8313218
16.0.6 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-06 09:30:05 +01:00
Nextcloud bot
bf3de19f62
[tx-robot] updated from transifex 2019-11-06 02:16:25 +00:00
Nextcloud bot
a575ef9145
[tx-robot] updated from transifex 2019-11-05 02:16:03 +00:00
Nextcloud bot
153a764e3c
[tx-robot] updated from transifex 2019-11-04 02:15:43 +00:00
Nextcloud bot
803b54186b
[tx-robot] updated from transifex 2019-11-03 02:16:22 +00:00
Nextcloud bot
96d4233545
[tx-robot] updated from transifex 2019-11-02 02:15:14 +00:00
Roeland Jago Douma
c34abfa16b
Merge pull request #17768 from nextcloud/backport/17755/stable16 
[stable16] Bring back external storage group select delete
 2019-11-01 08:51:48 +01:00
Nextcloud bot
18d484dd30
[tx-robot] updated from transifex 2019-11-01 07:46:47 +00:00
John Molakvoæ (skjnldsv)
61681c9688 Bring back external storage group select delete 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-31 14:55:59 +00:00
Roeland Jago Douma
a5995d2f74
Merge pull request #17722 from nextcloud/version/16.0.6/rc1 
16.0.6 RC1
 2019-10-31 09:11:34 +01:00
Roeland Jago Douma
1a607a5153
Bump ca-bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 21:07:59 +01:00
Roeland Jago Douma
73411eae9f
16.0.6 RC1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 19:54:41 +01:00
Roeland Jago Douma
522d050731
Merge pull request #17689 from nextcloud/backport/17626/stable16 
[stable16] Fix weird KDE bug with loginflowv2
 2019-10-30 19:53:13 +01:00
Roeland Jago Douma
7c207d002a
Merge pull request #17732 from nextcloud/backport/17730/stable16 
[stable16] Fix DAV mimetype search
 2019-10-29 11:17:05 +01:00
Roeland Jago Douma
3ce9f0013a 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:38 +00:00
Nextcloud bot
a7de52e9d9
[tx-robot] updated from transifex 2019-10-29 02:15:36 +00:00
Nextcloud bot
fc707b6f5b
[tx-robot] updated from transifex 2019-10-28 02:15:50 +00:00
Nextcloud bot
c5273404ee
[tx-robot] updated from transifex 2019-10-27 02:14:27 +00:00
Roeland Jago Douma
166bbadef1
Merge pull request #17687 from nextcloud/backport/17673/stable16 
[stable16] Fix jsConfigHelper lang/locale mixup
 2019-10-26 20:33:45 +02:00
Roeland Jago Douma
bb42b520ef Fix weird KDE bug with loginflowv2 
It seems that KDE by default opens the url in secret.
Should fix: https://github.com/nextcloud/desktop/issues/1412

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-26 11:54:37 +00:00
Roeland Jago Douma
4dc91420cf 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:46 +00:00
Roeland Jago Douma
70fea997af 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:46 +00:00
Nextcloud bot
57f901e972
[tx-robot] updated from transifex 2019-10-26 02:15:31 +00:00
Nextcloud bot
e298edb243
[tx-robot] updated from transifex 2019-10-25 02:15:47 +00:00
Nextcloud bot
27cadc5dcd
[tx-robot] updated from transifex 2019-10-24 02:15:40 +00:00
Roeland Jago Douma
f24bb46b06
Merge pull request #17653 from nextcloud/backport/16727/stable16 
[stable16] Reset and init new user form language
 2019-10-23 14:25:04 +02:00
John Molakvoæ (skjnldsv)
c6d664a817 Reset and init new user form language 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-23 06:51:24 +00:00
Roeland Jago Douma
cbc82a9449
Merge pull request #17648 from nextcloud/backport/16782/stable16 
[stable16] Stop if there is no encrypted token
 2019-10-23 08:36:20 +02:00
Nextcloud bot
b8be6ed15e
[tx-robot] updated from transifex 2019-10-23 02:15:39 +00:00
Daniel Kesselberg
3a995a1656 Add test case for existing user with token null 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-22 19:15:14 +00:00
Daniel Kesselberg
7b4d5aa8a9 Return the disabled user mock instead of the existing 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-22 19:15:14 +00:00
Daniel Kesselberg
34fa5dae37 Stop if there is no encrypted token 
Fix Argument 1 passed to OC\Security\Crypto::decrypt() must be of the type string, null given

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-22 19:15:14 +00:00
Roeland Jago Douma
d5aaf66479
Merge pull request #17641 from nextcloud/backport/17578/stable16 
[stable16] [stable17] Load additional scripts on help page
 2019-10-22 20:18:32 +02:00
Julius Härtl
59d0b4402e Load additional scripts on help page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-22 14:13:19 +00:00
blizzz
6a9acba384
Merge pull request #17622 from nextcloud/backport/17450/stable16 
[stable16] hide strange Everyone and Disabled group numbers with LDAP
 2019-10-22 10:17:21 +02:00
Nextcloud bot
377a955f86
[tx-robot] updated from transifex 2019-10-22 02:15:58 +00:00
Roeland Jago Douma
6b18986a87
Merge pull request #17619 from nextcloud/fix/noid/visibility 
[stable16] fix method scope
 2019-10-21 21:04:30 +02:00
Roeland Jago Douma
a9f1ab83e6
Merge pull request #17618 from nextcloud/backport/17595/stable16 
[stable16] treat LDAP error 50 as auth issue, prevents lost server connection errors
 2019-10-21 16:49:33 +02:00
npmbuildbot[bot]
2647e61321 Compile assets 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-21 11:50:34 +00:00
Arthur Schiwon
4294347e6a
backport of #17450 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 13:46:52 +02:00
Arthur Schiwon
7a31a482f4
fix call of a protected method by a different class 
was due to a backport while relying on not backported changes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 12:50:47 +02:00
Arthur Schiwon
8ce5346491 treat LDAP error 50 as auth issue, prevents lost server connection errors 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 09:57:24 +00:00
Nextcloud bot
63479ba72e
[tx-robot] updated from transifex 2019-10-21 02:16:05 +00:00