]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agodo not explode when getting permissions from a FailedStorage 11389/head
Arthur Schiwon [Wed, 26 Sep 2018 08:43:40 +0000 (10:43 +0200)]
do not explode when getting permissions from a FailedStorage

for instance if a user of an external user backend is not available
currently, the whole Files UI would be frozen.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #11373 from nextcloud/gs-and-saml-stable14
blizzz [Wed, 26 Sep 2018 09:04:54 +0000 (11:04 +0200)]
Merge pull request #11373 from nextcloud/gs-and-saml-stable14

[stable14] make the server ready to use global scale with SAML as auth back-end

6 years agoMerge pull request #11374 from nextcloud/stable14-content-list-flex-fixes
Morris Jobke [Wed, 26 Sep 2018 08:11:32 +0000 (10:11 +0200)]
Merge pull request #11374 from nextcloud/stable14-content-list-flex-fixes

[stable14] Fix default flex shrink on list

6 years agoFix default flex shrink on list 11374/head
John Molakvoæ (skjnldsv) [Tue, 25 Sep 2018 08:36:46 +0000 (10:36 +0200)]
Fix default flex shrink on list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoadd back-end as parameter to the pre-login hook 11373/head
Bjoern Schiessle [Fri, 14 Sep 2018 15:23:06 +0000 (17:23 +0200)]
add back-end as parameter to the pre-login hook

This is needed for the Global Scale setup to allow the master
node to perform different operations during login, depending
on the user management. Because in case of SAML, the authentication
at the idp happens at the master node.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #11361 from nextcloud/rel-14.0.1 v14.0.1
Joas Schilling [Tue, 25 Sep 2018 06:33:42 +0000 (08:33 +0200)]
Merge pull request #11361 from nextcloud/rel-14.0.1

Increase version for 14.0.1

6 years agoIncrease version for 14.0.1 11361/head
Joas Schilling [Tue, 25 Sep 2018 06:19:39 +0000 (08:19 +0200)]
Increase version for 14.0.1

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #11340 from nextcloud/stable14-add-unit-test-findlanguagefromlocale
Morris Jobke [Mon, 24 Sep 2018 10:20:31 +0000 (12:20 +0200)]
Merge pull request #11340 from nextcloud/stable14-add-unit-test-findlanguagefromlocale

[14] Add unit test for findLanguageFromLocale

6 years agoAdd simple unit test for findLanguageFromLocale 11340/head
Daniel Kesselberg [Sun, 23 Sep 2018 18:12:00 +0000 (20:12 +0200)]
Add simple unit test for findLanguageFromLocale

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoMerge pull request #11259 from nextcloud/fix/11144/backport14
Joas Schilling [Thu, 20 Sep 2018 11:43:24 +0000 (13:43 +0200)]
Merge pull request #11259 from nextcloud/fix/11144/backport14

[14] Fixes empty favorite names for trailing slashes

6 years agoMerge pull request #11173 from nextcloud/update-version-14.0.1 v14.0.1RC1
Joas Schilling [Thu, 20 Sep 2018 10:48:49 +0000 (12:48 +0200)]
Merge pull request #11173 from nextcloud/update-version-14.0.1

Prepare 14.0.1 release

6 years agoPrepare 14.0.1 release 11173/head
Joas Schilling [Tue, 11 Sep 2018 14:26:07 +0000 (16:26 +0200)]
Prepare 14.0.1 release

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #11302 from nextcloud/backport/11297/this-database-dude
blizzz [Thu, 20 Sep 2018 08:52:15 +0000 (10:52 +0200)]
Merge pull request #11302 from nextcloud/backport/11297/this-database-dude

[stable14] Fix expiration code of tokens

6 years agoMerge pull request #11077 from nextcloud/stable14-11064-fix-markup-and-style-of-menti...
blizzz [Thu, 20 Sep 2018 08:37:23 +0000 (10:37 +0200)]
Merge pull request #11077 from nextcloud/stable14-11064-fix-markup-and-style-of-mentions-in-comments

[stable14] Fix markup and style of mentions in comments

6 years agoMerge pull request #11294 from nextcloud/stable14-locale-template-fix
blizzz [Thu, 20 Sep 2018 08:37:00 +0000 (10:37 +0200)]
Merge pull request #11294 from nextcloud/stable14-locale-template-fix

[stable14] Use user locale as default in the template

6 years agoMerge pull request #11288 from nextcloud/backport/11171/shared-by-info-for-room-share...
Joas Schilling [Thu, 20 Sep 2018 08:26:18 +0000 (10:26 +0200)]
Merge pull request #11288 from nextcloud/backport/11171/shared-by-info-for-room-shares-without-names

[stable14] Shared by info for room shares without names

6 years agoMerge pull request #11287 from nextcloud/backport/11041/get_permission_of_storage_for...
Joas Schilling [Thu, 20 Sep 2018 08:25:34 +0000 (10:25 +0200)]
Merge pull request #11287 from nextcloud/backport/11041/get_permission_of_storage_for_shares

[stable14] Get permission of storage for shares

6 years agoMerge pull request #11293 from nextcloud/backport/11292/do-not-apcu-cache-the-autoloader
Joas Schilling [Thu, 20 Sep 2018 08:08:02 +0000 (10:08 +0200)]
Merge pull request #11293 from nextcloud/backport/11292/do-not-apcu-cache-the-autoloader

[stable14] Revert "Use APCu caching of composer"

6 years agoAlso adjust the expiration of PublicKeyTokenProvider 11302/head
Joas Schilling [Thu, 20 Sep 2018 07:54:27 +0000 (09:54 +0200)]
Also adjust the expiration of PublicKeyTokenProvider

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoCopy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to getTokenById
Joas Schilling [Wed, 19 Sep 2018 15:55:48 +0000 (17:55 +0200)]
Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to getTokenById

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #11291 from nextcloud/stable14-fix-icons-cacher
blizzz [Wed, 19 Sep 2018 20:40:15 +0000 (22:40 +0200)]
Merge pull request #11291 from nextcloud/stable14-fix-icons-cacher

[stable14] Fix icons cacher regex for compressed output

6 years agoFixes empty favorite names for trailing slashes 11259/head
Michael Weimann [Fri, 14 Sep 2018 20:06:56 +0000 (22:06 +0200)]
Fixes empty favorite names for trailing slashes

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoFix since tag 11294/head
John Molakvoæ (skjnldsv) [Wed, 19 Sep 2018 14:02:09 +0000 (16:02 +0200)]
Fix since tag

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFallback to $lang if no $locale match
John Molakvoæ (skjnldsv) [Thu, 13 Sep 2018 09:30:57 +0000 (11:30 +0200)]
Fallback to $lang if no $locale match

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoTypehint
John Molakvoæ (skjnldsv) [Mon, 10 Sep 2018 09:17:03 +0000 (11:17 +0200)]
Typehint

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoSince requirement
John Molakvoæ (skjnldsv) [Mon, 10 Sep 2018 08:48:53 +0000 (10:48 +0200)]
Since requirement

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix public l10n
John Molakvoæ (skjnldsv) [Mon, 10 Sep 2018 08:45:18 +0000 (10:45 +0200)]
Fix public l10n

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoUse user locale as default in the template
John Molakvoæ (skjnldsv) [Mon, 10 Sep 2018 08:19:49 +0000 (10:19 +0200)]
Use user locale as default in the template

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11282 from nextcloud/backport/11183/fix-link-for-update-notifications
Joas Schilling [Wed, 19 Sep 2018 13:59:25 +0000 (15:59 +0200)]
Merge pull request #11282 from nextcloud/backport/11183/fix-link-for-update-notifications

[stable14] Fix the link and anchor for the update notifications

6 years agoRevert "Use APCu caching of composer" 11293/head
Joas Schilling [Wed, 19 Sep 2018 13:47:01 +0000 (15:47 +0200)]
Revert "Use APCu caching of composer"

This reverts commit 948ab8a4d06b3821ab94c11a3a04c820e60d6c8a.

For details why see https://github.com/nextcloud/server/issues/11290

6 years agoFix icons cacher regex for compressed output 11291/head
John Molakvoæ (skjnldsv) [Fri, 24 Aug 2018 22:32:54 +0000 (00:32 +0200)]
Fix icons cacher regex for compressed output

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11283 from nextcloud/stable14-11268-include-empty-directories...
blizzz [Wed, 19 Sep 2018 13:24:28 +0000 (15:24 +0200)]
Merge pull request #11283 from nextcloud/stable14-11268-include-empty-directories-in-the-default-state-of-acceptance-tests

[stable14] Include empty directories in the default state of acceptance tests

6 years agoMerge pull request #11280 from nextcloud/backport/11080/stable14
blizzz [Wed, 19 Sep 2018 13:18:01 +0000 (15:18 +0200)]
Merge pull request #11280 from nextcloud/backport/11080/stable14

[stable14] replace setcookie value with '' instead of null.

6 years agoMerge pull request #11277 from nextcloud/stable14-11257-prevent-comment-being-compose...
blizzz [Wed, 19 Sep 2018 13:17:12 +0000 (15:17 +0200)]
Merge pull request #11277 from nextcloud/stable14-11257-prevent-comment-being-composed-from-overlapping-the-submit-button

[stable14] Prevent comment being composed from overlapping the submit button

6 years agoMerge pull request #11276 from nextcloud/stable14-11054-fix-size-of-icons-in-menus...
blizzz [Wed, 19 Sep 2018 13:16:23 +0000 (15:16 +0200)]
Merge pull request #11276 from nextcloud/stable14-11054-fix-size-of-icons-in-menus-inside-apps-when-shown-as-images

[stable14] Fix size of icons in menus inside apps when shown as images

6 years agoBetter shared-by info for conversations without names 11288/head
Joas Schilling [Tue, 11 Sep 2018 10:57:36 +0000 (12:57 +0200)]
Better shared-by info for conversations without names

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoUpdate test now that we check permissions properly 11287/head
Roeland Jago Douma [Thu, 6 Sep 2018 15:09:00 +0000 (17:09 +0200)]
Update test now that we check permissions properly

Now that we actually check thepermissions properly we have to update the
tests.

* We checked an invalid path
* We checked from wrong permissions (files never have CREATE permissions
for example)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoProperly check share permissions
Roeland Jago Douma [Thu, 6 Sep 2018 15:07:49 +0000 (17:07 +0200)]
Properly check share permissions

isCreatable only works on folders
isUpdatable if the file is not there but it is a part file also has to
be checked on the folder

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoFix shared cache
Roeland Jago Douma [Wed, 5 Sep 2018 20:48:08 +0000 (22:48 +0200)]
Fix shared cache

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoCheck the permission of the underlying storage
Roeland Jago Douma [Mon, 3 Sep 2018 20:56:28 +0000 (22:56 +0200)]
Check the permission of the underlying storage

Else shares might expose more permissions than the storage actually
providers.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoInclude empty directories in the default state of acceptance tests 11283/head
Daniel Calviño Sánchez [Tue, 18 Sep 2018 07:27:59 +0000 (09:27 +0200)]
Include empty directories in the default state of acceptance tests

Before each scenario of the acceptance tests is run the Nextcloud server
is reset to a default state. To do this the full directory of the
Nextcloud server is commited to a local Git repository and then reset to
that commit when needed.

Unfortunately, Git does not support including empty directories in a
commit. Due to this, when the default state was restored, it could
happen that the file cache listed an empty directory that did not exist
because it was not properly restored (for example,
"data/appdata_*/css/icons"), and that in turn could lead to an error
when the directory was used.

Currently the only way to force Git to include an empty directory is to
add a dummy file to the directory (so it will no longer be empty,
but that should not be a problem in the affected directories, even if
the dummy file is not included in the file cache); although Git FAQ
suggests using a ".gitignore" file a ".keep" file was used instead, as
it conveys better its purpose.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix the link and anchor for the update notifications 11282/head
Joas Schilling [Wed, 12 Sep 2018 08:24:02 +0000 (10:24 +0200)]
Fix the link and anchor for the update notifications

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoreplace setcookie value with '' instead of null. 11280/head
MartB [Thu, 6 Sep 2018 18:34:16 +0000 (20:34 +0200)]
replace setcookie value with '' instead of null.

The php documentation states that an empty string should be used for a cookie when it has no real value.
null leads to the following error: expects parameter 2 to be string, null given

Signed-off-by: Martin Böh <mart.b@outlook.de>
6 years agoPrevent comment being composed from overlapping the submit button 11277/head
Daniel Calviño Sánchez [Thu, 6 Sep 2018 16:09:47 +0000 (18:09 +0200)]
Prevent comment being composed from overlapping the submit button

The submit button is placed in the text area using absolute positioning,
so it is not taken into account when calculating the text layout. Due to
this it is necessary to add an explicit padding to the right of the text
area to prevent the text from overlapping the submit button.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix size of icons in menus inside apps when shown as images 11276/head
Daniel Calviño Sánchez [Tue, 4 Sep 2018 20:21:22 +0000 (22:21 +0200)]
Fix size of icons in menus inside apps when shown as images

Some popover menus, like the contacts menu, still show their icon using
an img element. The main CSS rules assume that a "content-box" sizing is
being used, and thus set the size and padding of the image to add up to
the line height.

However, ".app-*" descendants use a "border-box" sizing, so when a menu
with an image was shown in an app the icon was not properly shown. Now
both the width and height of the image is set to the item height in
those cases, which causes the visible size of the icon to be the item
height minus the padding (the same as when "content-box" sizing is
used).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #11237 from nextcloud/backport/11042/stable14
Joas Schilling [Mon, 17 Sep 2018 08:10:54 +0000 (10:10 +0200)]
Merge pull request #11237 from nextcloud/backport/11042/stable14

[stable14] Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894

6 years agoRemove filter_var flags due to PHP 7.3 deprecation, fixes #10894 11237/head
Patrik Kernstock [Mon, 3 Sep 2018 22:58:44 +0000 (00:58 +0200)]
Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894

Signed-off-by: Patrik Kernstock <info@pkern.at>
6 years agoMerge pull request #11201 from nextcloud/backport/11036/stable14
Joas Schilling [Thu, 13 Sep 2018 09:21:08 +0000 (11:21 +0200)]
Merge pull request #11201 from nextcloud/backport/11036/stable14

[stable14]  fix check for more users in sharing dialogue

6 years agoMerge pull request #11191 from nextcloud/backport/11091-cannot-read-passwd
blizzz [Thu, 13 Sep 2018 08:32:29 +0000 (10:32 +0200)]
Merge pull request #11191 from nextcloud/backport/11091-cannot-read-passwd

[14] Remove posix_getpwuid and compare only userid

6 years agoBackport of #11036 to stable14 11201/head
Arthur Schiwon [Mon, 3 Sep 2018 15:18:00 +0000 (17:18 +0200)]
Backport of #11036 to stable14

fix check for more users

after a refactor users et al were undefined. The check condition was moved.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
don't user a higher paging size than max autocomplete entries are set

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
adjust and extend js unit tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoAdd int-typehint 11191/head
Daniel Kesselberg [Wed, 12 Sep 2018 13:05:17 +0000 (15:05 +0200)]
Add int-typehint

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoRemove posix_getpwuid and compare only userid
Daniel Kesselberg [Thu, 6 Sep 2018 12:04:06 +0000 (14:04 +0200)]
Remove posix_getpwuid and compare only userid

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoMerge pull request #11187 from nextcloud/backport/11133/invalid-exception
blizzz [Wed, 12 Sep 2018 11:21:50 +0000 (13:21 +0200)]
Merge pull request #11187 from nextcloud/backport/11133/invalid-exception

[stable14] Fix exception class

6 years agoMerge pull request #11186 from nextcloud/backport/11181/user-list-broken-with-integer...
blizzz [Wed, 12 Sep 2018 11:17:13 +0000 (13:17 +0200)]
Merge pull request #11186 from nextcloud/backport/11181/user-list-broken-with-integer-only-users

[stable14] Fix user and group listing with users that have an integer user id

6 years agoFix exception class 11187/head
Joas Schilling [Mon, 10 Sep 2018 08:03:42 +0000 (10:03 +0200)]
Fix exception class

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoFix user and group listing with users that have an integer user id 11186/head
Joas Schilling [Wed, 12 Sep 2018 07:40:27 +0000 (09:40 +0200)]
Fix user and group listing with users that have an integer user id

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #11152 from nextcloud/davclient-js-decode-14
John Molakvoæ [Tue, 11 Sep 2018 08:46:12 +0000 (10:46 +0200)]
Merge pull request #11152 from nextcloud/davclient-js-decode-14

[14] fix js files client for user names with spaces

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 agoAdd new line at the end of file 11077/head
Daniel Calviño Sánchez [Wed, 5 Sep 2018 15:40:09 +0000 (17:40 +0200)]
Add new line at the end of file

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoEnsure that the avatar and the user name will be kept together
Daniel Calviño Sánchez [Wed, 5 Sep 2018 15:37:50 +0000 (17:37 +0200)]
Ensure that the avatar and the user name will be kept together

Otherwise a line break could be added between the avatar and the user
name when the wrapper is close to the right border of the message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoRemove unneeded CSS rule for mentions
Daniel Calviño Sánchez [Wed, 5 Sep 2018 15:13:59 +0000 (17:13 +0200)]
Remove unneeded CSS rule for mentions

Most of the properties of the rule are not needed for mentions, so the
rule is no longer applied to them; the only needed property was moved to
the main rule for mentions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix pointer cursor not shown on avatars
Daniel Calviño Sánchez [Wed, 5 Sep 2018 15:02:48 +0000 (17:02 +0200)]
Fix pointer cursor not shown on avatars

When the cursor is on an avatar wrapper the cursor is shown as a pointer
to inform the user that it can be clicked (which will either show the
contacts menu or insert a mention, depending on the case); the cursor
must be explicitly defined for the "img" element that shows the avatar
too, or otherwise the default cursor would be shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoHighlight mentions to the current user
Daniel Calviño Sánchez [Wed, 5 Sep 2018 08:50:32 +0000 (10:50 +0200)]
Highlight mentions to the current user

Like done in Talk, mentions to the current user are now shown with the
primary colors to make them more prominent.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoEnsure that the user name is shown in bold in mentions
Daniel Calviño Sánchez [Wed, 5 Sep 2018 08:19:57 +0000 (10:19 +0200)]
Ensure that the user name is shown in bold in mentions

Different browsers use different font weights for strong elements
(Chromium uses "bold", but Firefox uses "bolder", which is relative to
the font weight of the parent), so now the user name in mentions is
explicitly shown with a bold weight.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoReformat embedded HTML code to resemble HTML code
Daniel Calviño Sánchez [Wed, 5 Sep 2018 07:28:34 +0000 (09:28 +0200)]
Reformat embedded HTML code to resemble HTML code

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoRemove space between avatar and user name
Daniel Calviño Sánchez [Wed, 5 Sep 2018 07:10:32 +0000 (09:10 +0200)]
Remove space between avatar and user name

The avatar should be shown immediately after the avatar to be able to
accurately define the space between them using only CSS rules.

Note that in the case of the "atwho" menu it is not really needed, as a
whitespace removal seems to be done automatically by the plugin, but it
was modified for its displayed elements too for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoShow avatar using "span" instead of "div"
Daniel Calviño Sánchez [Wed, 5 Sep 2018 06:36:35 +0000 (08:36 +0200)]
Show avatar using "span" instead of "div"

Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
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>