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

50790 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
60c1cd8063
17.0.1 RC1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-30 19:54:00 +01:00
Roeland Jago Douma
97812856cf
Merge pull request #17688 from nextcloud/backport/17626/stable17 
[stable17] Fix weird KDE bug with loginflowv2
 2019-10-30 19:53:09 +01:00
Roeland Jago Douma
7b766fad93
Merge pull request #17748 from nextcloud/backport/17674/stable17 
[stable17] Do not show 'Get your own free account' on services under subscription
 2019-10-30 14:19:20 +01: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
767455f49c
Merge pull request #17742 from nextcloud/backport/17740/stable17 
[stable17] Return null from migration to match with typehint
 2019-10-30 09:24:03 +01:00
Daniel Kesselberg
18e3ec10f5 Return $schema on change and null otherwise 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-29 19:39:04 +00:00
Roeland Jago Douma
d30f86e936
Merge pull request #17731 from nextcloud/backport/17730/stable17 
[stable17] Fix DAV mimetype search
 2019-10-29 11:16:41 +01: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
Nextcloud bot
743bd4156f
[tx-robot] updated from transifex 2019-10-29 02:15:29 +00:00
Roeland Jago Douma
01b765fc8a
Merge pull request #17716 from nextcloud/backport/17712/stable17 
[stable17] Make sure limit is never negative
 2019-10-28 18:58:48 +01: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
Nextcloud bot
c4a2725f2b
[tx-robot] updated from transifex 2019-10-28 02:15:42 +00:00
Nextcloud bot
090169dab7
[tx-robot] updated from transifex 2019-10-27 02:14:19 +00:00
Roeland Jago Douma
e6bb1b8fed
Merge pull request #17686 from nextcloud/backport/17673/stable17 
[stable17] Fix jsConfigHelper lang/locale mixup
 2019-10-26 20:33:39 +02:00
Roeland Jago Douma
a33b0519c8 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:53:51 +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
Nextcloud bot
5e89d5f421
[tx-robot] updated from transifex 2019-10-26 02:15:24 +00:00
Roeland Jago Douma
a03f6c36a6
Merge pull request #17676 from nextcloud/backport/17469/stable17 
[stable17] fix filename overlapping on mobile
 2019-10-25 21:09:59 +02:00
Roeland Jago Douma
5359ea90d8
Merge pull request #17681 from nextcloud/backport/17678/stable17 
[stable17] Harden middleware check
 2019-10-25 19:14:11 +02:00
Roeland Jago Douma
a2dec13283 Harden middleware check 
These annotations will allow for extra checks. And thus make it harder
to break things.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-25 14:34:41 +00:00
Greta Doci
fffbcc6b1b add comment 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-10-25 13:00:40 +00:00
Greta Doci
bedbb343c3 fix filename overlapping on mobile ref #17364 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-10-25 13:00:39 +00:00
Nextcloud bot
b2ccf4d17f
[tx-robot] updated from transifex 2019-10-25 02:15:40 +00:00
Nextcloud bot
28b97e591f
[tx-robot] updated from transifex 2019-10-24 02:15:34 +00:00
Roeland Jago Douma
0308f1960b
Merge pull request #17300 from nextcloud/backport/17110/stable17 
[stable17] Position fixed for .toastify.toast
 2019-10-23 08:25:39 +02:00
Nextcloud bot
5ac7195e55
[tx-robot] updated from transifex 2019-10-23 02:15:32 +00:00
Roeland Jago Douma
6c64af16bb
Merge pull request #17305 from nextcloud/backport/15557/stable17 
[stable17] Fix fetching additional search results on scrolling down
 2019-10-22 22:30:37 +02:00
zorn-v
af100489e9 Position fixed for .toastify.toast 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-22 18:35:19 +00:00
René Bühlmann
e6cec45382
Fix fetching additional search results on scrolling down 
Signed-off-by: René Bühlmann <rene@buehlmann.net>
 2019-10-22 20:02:25 +02:00
Roeland Jago Douma
c0cdc68741
Merge pull request #17156 from nextcloud/stable17-16976 
[stable17] Always use the folder icon depending on the mount type if not a share mount
 2019-10-22 19:11:02 +02:00
Roeland Jago Douma
63fcd7733c
Merge pull request #17578 from nextcloud/stable17-help-about 
[stable17] Load additional scripts on help page
 2019-10-22 16:12:29 +02:00
Roeland Jago Douma
3dfcad949e
Merge pull request #17617 from nextcloud/backport/17595/stable17 
[stable17] treat LDAP error 50 as auth issue, prevents lost server connection errors
 2019-10-22 16:09:11 +02:00
Julius Härtl
23bd8f7430 Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-22 14:07:50 +00:00
Julius Härtl
4a672f59d2
Fallback to directory icon based on the mount type 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-22 15:53:39 +02:00
Roeland Jago Douma
cd6fa7e245
Merge pull request #17638 from nextcloud/backport/stable17/17627 
[stable17] Fix browser back button
 2019-10-22 15:50:30 +02:00
Roeland Jago Douma
e695d87b14 Fix browser back button 
Fixes #17108

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-22 12:58:53 +00:00
blizzz
348a7bb683
Merge pull request #17621 from nextcloud/backport/17450/stable17 
[stable17] hide strange Everyone and Disabled group numbers with LDAP
 2019-10-22 10:16:44 +02:00
Roeland Jago Douma
ade801160f
Merge pull request #17581 from nextcloud/backport/stable17/17548 
[stable17] Pass on direct query parameter during login
 2019-10-22 08:53:02 +02:00
Nextcloud bot
5ef19dacc2
[tx-robot] updated from transifex 2019-10-22 02:15:50 +00:00
Roeland Jago Douma
430393f213 [stable17] Pass on direct query parameter during login 
If direct is set we should forward it again.
This to make SAML direct login work again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-21 13:28:27 +00:00
npmbuildbot[bot]
7fcdb70292 Compile assets 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-21 11:37:08 +00:00
Arthur Schiwon
4bdd0db8d3
backport of #17450 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 13:33:36 +02:00
Arthur Schiwon
67d68deba1 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:56:39 +00:00
Roeland Jago Douma
a9775e36d2
Merge pull request #17597 from nextcloud/backport/17575/stable17 
[stable17] Include the share in the Files_Sharing::loadAdditionalScripts event
 2019-10-21 09:46:07 +02:00
Nextcloud bot
bad70805e4
[tx-robot] updated from transifex 2019-10-21 02:15:57 +00:00
Nextcloud bot
aa58d6c980
[tx-robot] updated from transifex 2019-10-20 02:16:50 +00:00
Daniel Calviño Sánchez
c765dc46e7 Include the share in the Files_Sharing::loadAdditionalScripts event 
This provides a better context for apps using the event, for example to
load one script or another depending on whether the share is a file or a
folder.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-19 09:13:59 +00:00
Roeland Jago Douma
6c0e6b531d
Merge pull request #17579 from nextcloud/backport/17543/stable17 
[stable17] Let SCSS cleanup only run once
 2019-10-19 11:11:52 +02:00
Roeland Jago Douma
6b505fe3b5
Merge pull request #17589 from nextcloud/backport/17585/stable17 
[stable17] added documentation links on settings pages
 2019-10-19 11:10:40 +02:00