]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agofix js files client for user names with spaces 11152/head
Robin Appelman [Mon, 10 Sep 2018 20:37:01 +0000 (22:37 +0200)]
fix js files client for user names with spaces

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #11090 from nextcloud/backport/11082/stable14
Roeland Jago Douma [Fri, 7 Sep 2018 11:59:45 +0000 (13:59 +0200)]
Merge pull request #11090 from nextcloud/backport/11082/stable14

[stable14] Do not invalidate main token on OAuth

6 years agoMerge pull request #11103 from nextcloud/backport/token_expire_hardening
Roeland Jago Douma [Fri, 7 Sep 2018 11:59:10 +0000 (13:59 +0200)]
Merge pull request #11103 from nextcloud/backport/token_expire_hardening

[stable14] Expire tokens hardening

6 years agoMerge pull request #11039 from nextcloud/backport/fix/10968/upload-progress
Roeland Jago Douma [Fri, 7 Sep 2018 11:58:58 +0000 (13:58 +0200)]
Merge pull request #11039 from nextcloud/backport/fix/10968/upload-progress

Fixes the upload progress bar layout - 14 backport

6 years agoExpire tokens hardening 11103/head
Roeland Jago Douma [Fri, 7 Sep 2018 08:01:31 +0000 (10:01 +0200)]
Expire tokens hardening

Just to be sure that the field is also not 0

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoDo not invalidate main token on OAuth 11090/head
Roeland Jago Douma [Thu, 6 Sep 2018 06:30:52 +0000 (08:30 +0200)]
Do not invalidate main token on OAuth

Fixes #10584

We deleted the main token when using the login flow else mutliple tokens
would show up for a single user.

However in the case of OAuth this is perfectly fine as the
authentication happens really in your browser:

1. You are already logged in, no need to log you out
2. You are not logged in yet, but since you log in into the exact same
browser the expected behavior is to stay logged in.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11069 from nextcloud/release/14.0.0 v14.0.0
Roeland Jago Douma [Thu, 6 Sep 2018 07:25:18 +0000 (09:25 +0200)]
Merge pull request #11069 from nextcloud/release/14.0.0

14.0.0 final

6 years ago14.0.0 final 11069/head
Roeland Jago Douma [Wed, 5 Sep 2018 10:58:10 +0000 (12:58 +0200)]
14.0.0 final

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11071 from nextcloud/bugfix-stable14/10727
Georg Ehrke [Wed, 5 Sep 2018 16:08:55 +0000 (18:08 +0200)]
Merge pull request #11071 from nextcloud/bugfix-stable14/10727

[stable14] remove LogicException, because it's also triggered with legitimate pa…

6 years agoremove LogicException, because it's also triggered with legitimate parameters 11071/head
Georg Ehrke [Sat, 1 Sep 2018 21:04:07 +0000 (23:04 +0200)]
remove LogicException, because it's also triggered with legitimate parameters

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #11052 from nextcloud/backport/10963/stable14
Roeland Jago Douma [Wed, 5 Sep 2018 08:30:29 +0000 (10:30 +0200)]
Merge pull request #11052 from nextcloud/backport/10963/stable14

[stable14] Updates logo scss to regard default values

6 years agoUpdates logo scss to regard default values 11052/head
Michael Weimann [Sun, 2 Sep 2018 11:10:23 +0000 (13:10 +0200)]
Updates logo scss to regard default values

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoFixes the upload progress bar layout 11039/head
Michael Weimann [Sun, 2 Sep 2018 17:11:11 +0000 (19:11 +0200)]
Fixes the upload progress bar layout

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoMerge pull request #10861 from nextcloud/version/noid/14.0.0RC2 v14.0.0RC2
Morris Jobke [Fri, 31 Aug 2018 13:09:46 +0000 (15:09 +0200)]
Merge pull request #10861 from nextcloud/version/noid/14.0.0RC2

14.0.0 RC 2

6 years ago14.0.0 RC 2 10861/head
Morris Jobke [Sun, 26 Aug 2018 10:07:52 +0000 (12:07 +0200)]
14.0.0 RC 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #10943 from nextcloud/fix/2fa-provider-dao-concurrent-insert
Morris Jobke [Fri, 31 Aug 2018 12:42:55 +0000 (14:42 +0200)]
Merge pull request #10943 from nextcloud/fix/2fa-provider-dao-concurrent-insert

Fix handlng of concurrent inserts of the 2FA provider registry DAO

6 years agoMerge pull request #10944 from nextcloud/content-list-overflow-fix
Roeland Jago Douma [Fri, 31 Aug 2018 12:19:06 +0000 (14:19 +0200)]
Merge pull request #10944 from nextcloud/content-list-overflow-fix

Fix overflow x scroll on app content list

6 years agoMerge pull request #10942 from nextcloud/feature/10776/longer-password-reset-time
Morris Jobke [Fri, 31 Aug 2018 12:13:14 +0000 (14:13 +0200)]
Merge pull request #10942 from nextcloud/feature/10776/longer-password-reset-time

Change password expiration time from 12h to 7d

6 years agoChange password expiration time from 12h to 7d 10942/head
Morris Jobke [Fri, 31 Aug 2018 07:26:09 +0000 (09:26 +0200)]
Change password expiration time from 12h to 7d

We use the same logic for creating accounts without a password and there the 12h is a bit short. Users don't expect that the signup link needs to be clicked within 12h - 7d should be a more expected behavior.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoFix handlng of concurrent inserts of the 2FA provider registry DAO 10943/head
Christoph Wurst [Fri, 31 Aug 2018 09:46:00 +0000 (11:46 +0200)]
Fix handlng of concurrent inserts of the 2FA provider registry DAO

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years agoFix overflow x scroll on app content list 10944/head
John Molakvoæ (skjnldsv) [Fri, 31 Aug 2018 07:17:54 +0000 (09:17 +0200)]
Fix overflow x scroll on app content list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 31 Aug 2018 00:12:09 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wrong-path
Morris Jobke [Thu, 30 Aug 2018 19:43:25 +0000 (21:43 +0200)]
Merge pull request #10939 from nextcloud/bugfix/10930/perm-checker-wrong-path

Fix path when app has wrong permission

6 years agoMerge pull request #10910 from nextcloud/customproperties-ignored-list
Morris Jobke [Thu, 30 Aug 2018 19:23:36 +0000 (21:23 +0200)]
Merge pull request #10910 from nextcloud/customproperties-ignored-list

use the same ignored properties list for both CustomerPropertiesBackends

6 years agoMerge pull request #10906 from nextcloud/request-params-array
Roeland Jago Douma [Thu, 30 Aug 2018 19:07:49 +0000 (21:07 +0200)]
Merge pull request #10906 from nextcloud/request-params-array

ensure we always return an array from `Request::getParams`

6 years agoMerge pull request #10936 from nextcloud/make-possible-to-pick-both-files-and-folders
Morris Jobke [Thu, 30 Aug 2018 19:03:25 +0000 (21:03 +0200)]
Merge pull request #10936 from nextcloud/make-possible-to-pick-both-files-and-folders

Make possible to pick both files and folders

6 years agoMerge pull request #10925 from nextcloud/use-main-text-color-for-editable-divs-and...
Morris Jobke [Thu, 30 Aug 2018 18:59:47 +0000 (20:59 +0200)]
Merge pull request #10925 from nextcloud/use-main-text-color-for-editable-divs-and-text-areas

Use main text color for editable divs and text areas

6 years agoFix path when app has wrong permission 10939/head
Daniel Kesselberg [Thu, 30 Aug 2018 18:52:43 +0000 (20:52 +0200)]
Fix path when app has wrong permission

Replace slow array function used in loop: https://github.com/kalessil/phpinspectionsea/blob/master/docs/performance.md#slow-array-function-used-in-loop

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoMerge pull request #10913 from nextcloud/do-not-parse-html-in-user-id-and-display...
Morris Jobke [Thu, 30 Aug 2018 18:52:20 +0000 (20:52 +0200)]
Merge pull request #10913 from nextcloud/do-not-parse-html-in-user-id-and-display-name

Do not parse HTML in user id and display name

6 years agoMerge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primary
Julius Härtl [Thu, 30 Aug 2018 15:35:40 +0000 (17:35 +0200)]
Merge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primary

Fix SCSS variable management with the theming app

6 years agoMerge pull request #10853 from nextcloud/apps-menu-fix-mobile
Julius Härtl [Thu, 30 Aug 2018 12:51:09 +0000 (14:51 +0200)]
Merge pull request #10853 from nextcloud/apps-menu-fix-mobile

Fix apps menu on mobile

6 years agoFix capabilities test 10924/head
Julius Härtl [Thu, 30 Aug 2018 12:45:06 +0000 (14:45 +0200)]
Fix capabilities test

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMake possible to pick both files and folders 10936/head
Daniel Calviño Sánchez [Thu, 30 Aug 2018 12:40:12 +0000 (14:40 +0200)]
Make possible to pick both files and folders

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoStore the mime type filter always as an array
Daniel Calviño Sánchez [Thu, 30 Aug 2018 12:23:47 +0000 (14:23 +0200)]
Store the mime type filter always as an array

This will make easier to check if both directories and files should be
pickable.

This also removes an unused assignment to the mime type.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix empty mime type filter
Daniel Calviño Sánchez [Thu, 30 Aug 2018 12:02:50 +0000 (14:02 +0200)]
Fix empty mime type filter

When the mime type is an empty array no filter should be applied.
However, the filter was loosely compared to an empty array, but as
arrays are objects then it became an implicit strict equality comparison
which always failed due to being different objects. Now the length of
the array is compared instead, and also moved outside the loop as it is
not needed to check it for each file.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMake the default element color for bright theming colors lighter
Julius Härtl [Wed, 29 Aug 2018 14:46:54 +0000 (16:46 +0200)]
Make the default element color for bright theming colors lighter

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoPrevent default action from being executed when the button is disabled
Daniel Calviño Sánchez [Thu, 30 Aug 2018 08:25:09 +0000 (10:25 +0200)]
Prevent default action from being executed when the button is disabled

When "enter" is pressed in the file picker a "click" event is triggered
on the primary action button. However, in some cases, like when the file
picker is in "Choose" mode and the current directory in the file picker
is the root folder, the primary action button is disabled. In those
cases pressing enter should not trigger a click action on the button and
be ignored instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 30 Aug 2018 00:12:07 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoUse main text color for editable divs and text areas 10925/head
Daniel Calviño Sánchez [Wed, 29 Aug 2018 15:32:50 +0000 (17:32 +0200)]
Use main text color for editable divs and text areas

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #10876 from nextcloud/bugfix/10873/theming-settingsbutton
Julius Härtl [Wed, 29 Aug 2018 15:24:05 +0000 (17:24 +0200)]
Merge pull request #10876 from nextcloud/bugfix/10873/theming-settingsbutton

Theming: apply proper size to the remove background button

6 years agoRemove border from primary button when color is bright
Julius Härtl [Wed, 29 Aug 2018 14:46:37 +0000 (16:46 +0200)]
Remove border from primary button when color is bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMove SCSS variable fetching before the variables.scss to properly calculate color...
Julius Härtl [Wed, 29 Aug 2018 14:46:12 +0000 (16:46 +0200)]
Move SCSS variable fetching before the variables.scss to properly calculate color values

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 29 Aug 2018 00:12:07 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoDo not parse HTML in user id and display name 10913/head
Joas Schilling [Tue, 17 Jul 2018 13:02:46 +0000 (15:02 +0200)]
Do not parse HTML in user id and display name

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agouse the same ignored properties list for both CustomerPropertiesBackends 10910/head
Robin Appelman [Tue, 28 Aug 2018 16:27:53 +0000 (18:27 +0200)]
use the same ignored properties list for both CustomerPropertiesBackends

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoensure we always return an array from `Request::getParams` 10906/head
Robin Appelman [Tue, 28 Aug 2018 16:11:42 +0000 (18:11 +0200)]
ensure we always return an array from `Request::getParams`

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #10854 from nextcloud/fix-10764
Morris Jobke [Tue, 28 Aug 2018 15:50:20 +0000 (17:50 +0200)]
Merge pull request #10854 from nextcloud/fix-10764

Allow same section class for multiple section types (fix #10764)

6 years agoMerge pull request #10871 from cviereck/patch-1
Morris Jobke [Tue, 28 Aug 2018 14:52:20 +0000 (16:52 +0200)]
Merge pull request #10871 from cviereck/patch-1

cast timestamps older than unix epoch to 0

6 years agoFix apps menu and typo 10853/head
John Molakvoæ (skjnldsv) [Tue, 28 Aug 2018 11:48:06 +0000 (13:48 +0200)]
Fix apps menu and typo

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10892 from nextcloud/fix-drag-shadow-in-files-app
John Molakvoæ [Tue, 28 Aug 2018 11:13:52 +0000 (13:13 +0200)]
Merge pull request #10892 from nextcloud/fix-drag-shadow-in-files-app

Fix drag shadow in Files app

6 years agoMerge pull request #10881 from nextcloud/fix/10705/notification-width
John Molakvoæ [Tue, 28 Aug 2018 11:08:09 +0000 (13:08 +0200)]
Merge pull request #10881 from nextcloud/fix/10705/notification-width

Makes the notifications area width equal to the contents

6 years agoMerge pull request #10875 from nextcloud/bugfix/10024/theming-footer-link
Julius Härtl [Tue, 28 Aug 2018 11:01:20 +0000 (13:01 +0200)]
Merge pull request #10875 from nextcloud/bugfix/10024/theming-footer-link

Theming: Only link Entity in footer if a url is set

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 28 Aug 2018 00:13:06 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoRemove limit on "max-width" for file names in drag shadow 10892/head
Daniel Calviño Sánchez [Mon, 27 Aug 2018 16:12:50 +0000 (18:12 +0200)]
Remove limit on "max-width" for file names in drag shadow

The general file list sets "max-width: 0" in the file names, which
causes the file names in the drag shadow to have no width for their
content and thus to overlap with the file size.

As that limit is needed for proper layout in the general file list it is
removed only for file names in drag shadows.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoIncrease z-index of drag shadow for files
Daniel Calviño Sánchez [Mon, 27 Aug 2018 16:08:45 +0000 (18:08 +0200)]
Increase z-index of drag shadow for files

The drag shadow is a sibling of "#content" so its z-index must be higher
than the z-index of the content children (navigation bar, app content
and app sidebar) to appear in front of them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMakes the notifications area width equal to the contents 10881/head
Michael Weimann [Mon, 27 Aug 2018 13:24:51 +0000 (15:24 +0200)]
Makes the notifications area width equal to the contents

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoTheming: Fix footer tests 10875/head
Julius Härtl [Mon, 27 Aug 2018 13:22:49 +0000 (15:22 +0200)]
Theming: Fix footer tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoTheming: Only Entity in footer if a url is set
Julius Härtl [Mon, 27 Aug 2018 10:17:25 +0000 (12:17 +0200)]
Theming: Only Entity in footer if a url is set

fixes #10024

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoTheming: apply proper size to the remove background button 10876/head
Julius Härtl [Mon, 27 Aug 2018 10:35:02 +0000 (12:35 +0200)]
Theming: apply proper size to the remove background button

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #10867 from nextcloud/bugfix/noid/a11y
Joas Schilling [Mon, 27 Aug 2018 09:16:28 +0000 (11:16 +0200)]
Merge pull request #10867 from nextcloud/bugfix/noid/a11y

Use empty alt tag for avatars since there is always the name next to it

6 years agocast timestamps older than unix epoch to 0 10871/head
Christian [Mon, 27 Aug 2018 05:44:24 +0000 (07:44 +0200)]
cast timestamps older than unix epoch to 0

This change solves issues #10870, which is caused by method castValue of class FileSearchBackend: It casts the timestamps older than the unix epoch to false., see my comment https://github.com/nextcloud/server/pull/10835#discussion_r212806153.

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 27 Aug 2018 00:12:14 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #10858 from nextcloud/public-logo-fixes
Roeland Jago Douma [Sun, 26 Aug 2018 19:34:08 +0000 (21:34 +0200)]
Merge pull request #10858 from nextcloud/public-logo-fixes

Fix public pages conflicting

6 years agoMake the color important 10867/head
Joas Schilling [Sun, 26 Aug 2018 17:12:57 +0000 (19:12 +0200)]
Make the color important

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoUse empty alt tag for avatars since there is always the name next to it
Joas Schilling [Sun, 26 Aug 2018 16:29:02 +0000 (18:29 +0200)]
Use empty alt tag for avatars since there is always the name next to it

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #10856 from nextcloud/bugfix/noid/comments-contactsmenu
John Molakvoæ [Sun, 26 Aug 2018 12:32:45 +0000 (14:32 +0200)]
Merge pull request #10856 from nextcloud/bugfix/noid/comments-contactsmenu

Fix contactsmenu for mentioned users in comments

6 years agoFix public pages conflicting 10858/head
John Molakvoæ (skjnldsv) [Sun, 26 Aug 2018 08:33:26 +0000 (10:33 +0200)]
Fix public pages conflicting

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10855 from nextcloud/stefan-niedermann-patch-1
Roeland Jago Douma [Sun, 26 Aug 2018 08:32:16 +0000 (10:32 +0200)]
Merge pull request #10855 from nextcloud/stefan-niedermann-patch-1

Add "Join the Team" section to README.md

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 26 Aug 2018 00:12:33 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoFix contactsmenu for mentioned users in comments 10856/head
Julius Härtl [Sat, 25 Aug 2018 16:25:47 +0000 (18:25 +0200)]
Fix contactsmenu for mentioned users in comments

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd "Join the Team" section to README.md 10855/head
Niedermann IT-Dienstleistungen [Sat, 25 Aug 2018 15:51:20 +0000 (17:51 +0200)]
Add "Join the Team" section to README.md

Written at the Nextcloud Conf workshop

6 years agoAllow same section class for multiple section types (fix #10764) 10854/head
sualko [Sat, 25 Aug 2018 14:48:37 +0000 (16:48 +0200)]
Allow same section class for multiple section types (fix #10764)

Signed-off-by: Klaus Herberth <klaus@jsxc.org>
6 years agoMerge pull request #10846 from nextcloud/bugfix/noid/add-the-new-share-type-to-the...
Morris Jobke [Sat, 25 Aug 2018 13:41:53 +0000 (15:41 +0200)]
Merge pull request #10846 from nextcloud/bugfix/noid/add-the-new-share-type-to-the-app-info-xsd

Add the new share type

6 years agoFix apps menu on mobile
John Molakvoæ (skjnldsv) [Sat, 25 Aug 2018 13:12:08 +0000 (15:12 +0200)]
Fix apps menu on mobile

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 25 Aug 2018 00:12:33 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoAdd the new share type 10846/head
Joas Schilling [Fri, 24 Aug 2018 21:06:44 +0000 (23:06 +0200)]
Add the new share type

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #10844 from nextcloud/version/noid/14.0.0RC1 v14.0.0RC1
Morris Jobke [Fri, 24 Aug 2018 20:51:45 +0000 (22:51 +0200)]
Merge pull request #10844 from nextcloud/version/noid/14.0.0RC1

14.0.0 RC 1

6 years ago14.0.0 RC 1 10844/head
Morris Jobke [Fri, 24 Aug 2018 20:25:22 +0000 (22:25 +0200)]
14.0.0 RC 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #10838 from nextcloud/header-fixes-and-public-note
Morris Jobke [Fri, 24 Aug 2018 20:21:55 +0000 (22:21 +0200)]
Merge pull request #10838 from nextcloud/header-fixes-and-public-note

Header fixes and public note

6 years agoFix jsunit 10838/head
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 20:05:43 +0000 (22:05 +0200)]
Fix jsunit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10827 from steiny2k/HEICHEIF
Roeland Jago Douma [Fri, 24 Aug 2018 19:49:33 +0000 (21:49 +0200)]
Merge pull request #10827 from steiny2k/HEICHEIF

HEIC previews as JPG rather than PNGs to save space.

6 years agoMerge pull request #10820 from nextcloud/fix/noid/emptydefaultprefix
Morris Jobke [Fri, 24 Aug 2018 19:37:00 +0000 (21:37 +0200)]
Merge pull request #10820 from nextcloud/fix/noid/emptydefaultprefix

[LDAP] The WebUI Wizard also should not assign empty config IDs

6 years agoFixes 10827/head
Roeland Jago Douma [Fri, 24 Aug 2018 19:27:21 +0000 (21:27 +0200)]
Fixes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10834 from nextcloud/add-support-for-room-shares
Roeland Jago Douma [Fri, 24 Aug 2018 19:15:54 +0000 (21:15 +0200)]
Merge pull request #10834 from nextcloud/add-support-for-room-shares

Add support for room shares

6 years agoMerge pull request #10835 from nextcloud/dav-search-no-negative-mtime
Morris Jobke [Fri, 24 Aug 2018 18:32:26 +0000 (20:32 +0200)]
Merge pull request #10835 from nextcloud/dav-search-no-negative-mtime

disallow negative mtime in dav search

6 years agoTests fixes
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 18:31:29 +0000 (20:31 +0200)]
Tests fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10803 from nextcloud/smb-dir-instead-of-allinfo
Morris Jobke [Fri, 24 Aug 2018 17:30:30 +0000 (19:30 +0200)]
Merge pull request #10803 from nextcloud/smb-dir-instead-of-allinfo

prefer using dir instead of allinfo for getting smb file info

6 years agoMerge pull request #10841 from nextcloud/load-app-catch-exceptions
Morris Jobke [Fri, 24 Aug 2018 17:29:47 +0000 (19:29 +0200)]
Merge pull request #10841 from nextcloud/load-app-catch-exceptions

also catch exceptions when loading apps

6 years agoFix tests 10834/head
Roeland Jago Douma [Fri, 24 Aug 2018 16:20:04 +0000 (18:20 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAdd support for rooms in the list of candidates to share with UI
Daniel Calviño Sánchez [Mon, 16 Jul 2018 01:51:45 +0000 (03:51 +0200)]
Add support for rooms in the list of candidates to share with UI

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoAdd rooms in the default candidate types to look for when sharing
Daniel Calviño Sánchez [Mon, 16 Jul 2018 01:48:50 +0000 (03:48 +0200)]
Add rooms in the default candidate types to look for when sharing

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #10773 from nextcloud/collapsible-dark-fix
Morris Jobke [Fri, 24 Aug 2018 15:56:00 +0000 (17:56 +0200)]
Merge pull request #10773 from nextcloud/collapsible-dark-fix

Accessibility theme fixes

6 years agoMerge branch 'header-fixes-and-public-note' of https://github.com/nextcloud/server...
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 15:40:31 +0000 (17:40 +0200)]
Merge branch 'header-fixes-and-public-note' of https://github.com/nextcloud/server into header-fixes-and-public-note

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix public share link order
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 15:40:05 +0000 (17:40 +0200)]
Fix public share link order

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agofix missing import 10803/head
Robin Appelman [Fri, 24 Aug 2018 15:34:36 +0000 (17:34 +0200)]
fix missing import

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoFix header logo padding
Julius Härtl [Fri, 24 Aug 2018 15:32:31 +0000 (17:32 +0200)]
Fix header logo padding

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #10828 from nextcloud/bugfix/fac-108/mimetype-detection-broken...
Morris Jobke [Fri, 24 Aug 2018 15:22:56 +0000 (17:22 +0200)]
Merge pull request #10828 from nextcloud/bugfix/fac-108/mimetype-detection-broken-for-junked-uploads

Fix mimetype detection for junked uploads

6 years agoalso catch exceptions when loading apps 10841/head
Robin Appelman [Fri, 24 Aug 2018 15:16:54 +0000 (17:16 +0200)]
also catch exceptions when loading apps

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #10724 from nextcloud/large-share-count-performance
Morris Jobke [Fri, 24 Aug 2018 15:10:17 +0000 (17:10 +0200)]
Merge pull request #10724 from nextcloud/large-share-count-performance

Improve performance when dealing with large numbers of shares

6 years agoFix public link order and fix skip to content
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 14:53:18 +0000 (16:53 +0200)]
Fix public link order and fix skip to content

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>