]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoMerge pull request #11493 from nextcloud/backport/11416/show-email-authtype-none-14
Morris Jobke [Mon, 1 Oct 2018 10:34:48 +0000 (12:34 +0200)]
Merge pull request #11493 from nextcloud/backport/11416/show-email-authtype-none-14

[stable14] Show auth type "None" in email settings

6 years agoMerge pull request #11488 from nextcloud/backport/11047/typo-config-sample
Morris Jobke [Mon, 1 Oct 2018 10:11:21 +0000 (12:11 +0200)]
Merge pull request #11488 from nextcloud/backport/11047/typo-config-sample

[stable14] Fix typo in config.sample.php

6 years agoMerge pull request #11490 from nextcloud/stable14-babel-npm-webpack-fixes
Roeland Jago Douma [Mon, 1 Oct 2018 10:01:40 +0000 (12:01 +0200)]
Merge pull request #11490 from nextcloud/stable14-babel-npm-webpack-fixes

[stable14] Update config and babel for ie11

6 years agoMerge pull request #11489 from nextcloud/backport/11123/2fa-button
Roeland Jago Douma [Mon, 1 Oct 2018 10:01:26 +0000 (12:01 +0200)]
Merge pull request #11489 from nextcloud/backport/11123/2fa-button

[stable14] Bugfix 2FA theme: buttons white

6 years agoShow auth type "None" in email settings 11493/head
Morris Jobke [Thu, 27 Sep 2018 14:59:43 +0000 (16:59 +0200)]
Show auth type "None" in email settings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoUsed CSS Variables 11489/head
EASY [Mon, 10 Sep 2018 14:16:37 +0000 (16:16 +0200)]
Used CSS Variables

6 years agoUpdate config and babel for ie11 11490/head
John Molakvoæ (skjnldsv) [Mon, 1 Oct 2018 08:25:00 +0000 (10:25 +0200)]
Update config and babel for ie11

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoUpdate theming.scss
EASY [Sun, 9 Sep 2018 09:15:35 +0000 (11:15 +0200)]
Update theming.scss

6 years agoFix typo in config.sample.php 11488/head
Marius Blüm [Tue, 4 Sep 2018 09:18:10 +0000 (11:18 +0200)]
Fix typo in config.sample.php

Signed-off-by: Marius Blüm <marius@lineone.io>
6 years agoMerge pull request #11451 from nextcloud/stable14_10833
Morris Jobke [Mon, 1 Oct 2018 08:19:07 +0000 (10:19 +0200)]
Merge pull request #11451 from nextcloud/stable14_10833

[stable14] Re-enable upload button after updating Avatar

6 years agoRe-enable upload button after updating Avatar fixes #8623 11451/head
Tobia De Koninck [Fri, 24 Aug 2018 13:15:16 +0000 (15:15 +0200)]
Re-enable upload button after updating Avatar fixes #8623

Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
6 years agoMerge pull request #11436 from nextcloud/assemblystream-eof-14
Roeland Jago Douma [Fri, 28 Sep 2018 14:56:34 +0000 (16:56 +0200)]
Merge pull request #11436 from nextcloud/assemblystream-eof-14

[14] AssemblyStream is also eof if we have no more source stream

6 years agoAssemblyStream is also eof if we have no more source stream 11436/head
Robin Appelman [Fri, 28 Sep 2018 12:39:23 +0000 (14:39 +0200)]
AssemblyStream is also eof if we have no more source stream

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #11418 from nextcloud/stable14-11411-fix-checkWellKnownUrl-not...
Morris Jobke [Fri, 28 Sep 2018 13:30:32 +0000 (15:30 +0200)]
Merge pull request #11418 from nextcloud/stable14-11411-fix-checkWellKnownUrl-not-being-executed

[stable14] Fix "checkWellKnownUrl" not being run

6 years agoMerge pull request #11421 from nextcloud/backport/11262/stable14
Morris Jobke [Fri, 28 Sep 2018 13:30:11 +0000 (15:30 +0200)]
Merge pull request #11421 from nextcloud/backport/11262/stable14

[stable14] use a dummy database name for the default postgres database name

6 years agoMerge pull request #11425 from nextcloud/stable14-hover-quota-used-space-regression
Morris Jobke [Fri, 28 Sep 2018 13:28:22 +0000 (15:28 +0200)]
Merge pull request #11425 from nextcloud/stable14-hover-quota-used-space-regression

[stable14] Add back the total used space per user

6 years agoMerge pull request #11430 from nextcloud/stable14-history-icon-center-fix
Roeland Jago Douma [Fri, 28 Sep 2018 13:22:21 +0000 (15:22 +0200)]
Merge pull request #11430 from nextcloud/stable14-history-icon-center-fix

[stable14] Center back the history icon

6 years agoCleanup 11430/head
John Molakvoæ (skjnldsv) [Fri, 28 Sep 2018 10:13:48 +0000 (12:13 +0200)]
Cleanup

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoCenter back the history icon
John Molakvoæ (skjnldsv) [Fri, 28 Sep 2018 10:07:04 +0000 (12:07 +0200)]
Center back the history icon

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11426 from nextcloud/stable14-inline-input-error-fix
Morris Jobke [Fri, 28 Sep 2018 09:32:31 +0000 (11:32 +0200)]
Merge pull request #11426 from nextcloud/stable14-inline-input-error-fix

[stable14] Fix invalid inline input confirm border

6 years agoFix invalid inline input confirm border 11426/head
John Molakvoæ (skjnldsv) [Fri, 28 Sep 2018 08:12:50 +0000 (10:12 +0200)]
Fix invalid inline input confirm border

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11422 from nextcloud/fix/acceptance-apps
Roeland Jago Douma [Fri, 28 Sep 2018 07:16:09 +0000 (09:16 +0200)]
Merge pull request #11422 from nextcloud/fix/acceptance-apps

Fix acceptance tests as app title changed

6 years agoAdd back the total used space per user 11425/head
John Molakvoæ (skjnldsv) [Fri, 28 Sep 2018 07:03:04 +0000 (09:03 +0200)]
Add back the total used space per user

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix acceptance tests as app title changed 11422/head
Roeland Jago Douma [Thu, 27 Sep 2018 19:58:49 +0000 (21:58 +0200)]
Fix acceptance tests as app title changed

The redundant app was removed. So we need to update the tests to make it
green.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agouse a dummy database name for the default postgres database name 11421/head
Robin Appelman [Mon, 17 Sep 2018 16:19:29 +0000 (18:19 +0200)]
use a dummy database name for the default postgres database name

For some reason the docker image does not setup the permissions correctly,
by using a different name the nextcloud installer will create the database instead
with the correct permissions

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoFix "checkWellKnownUrl" not being run 11418/head
Daniel Calviño Sánchez [Thu, 27 Sep 2018 11:31:58 +0000 (13:31 +0200)]
Fix "checkWellKnownUrl" not being run

The check is run only if its last parameter is true; data() tries to
convert the HTML attribute string to an actual JavaScript value, so
"true" is returned as an actual boolean instead of an string; as a
strict comparison against "true" was used the result was false and thus
the checks were not run.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #11385 from nextcloud/11372/fix/14-logo-height
Roeland Jago Douma [Thu, 27 Sep 2018 13:41:49 +0000 (15:41 +0200)]
Merge pull request #11385 from nextcloud/11372/fix/14-logo-height

[14] Fixes the logo height

6 years agoMerge pull request #11399 from nextcloud/stable14-11112-do-not-hide-the-progress...
Morris Jobke [Thu, 27 Sep 2018 12:05:48 +0000 (14:05 +0200)]
Merge pull request #11399 from nextcloud/stable14-11112-do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled

[stable14] Do not hide the progress bar while the chunked upload is being assembled

6 years agoMerge pull request #11389 from nextcloud/backport/11383/stable14
blizzz [Thu, 27 Sep 2018 08:51:43 +0000 (10:51 +0200)]
Merge pull request #11389 from nextcloud/backport/11383/stable14

[stable14] do not explode when getting permissions from a FailedStorage

6 years agoMerge pull request #11350 from nextcloud/stable14-11258-fix-contacts-menu-on-mentions
blizzz [Wed, 26 Sep 2018 13:30:36 +0000 (15:30 +0200)]
Merge pull request #11350 from nextcloud/stable14-11258-fix-contacts-menu-on-mentions

[stable14] Fix contacts menu on mentions

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 agoFixes the logo height 11385/head
Michael Weimann [Wed, 26 Sep 2018 09:10:13 +0000 (11:10 +0200)]
Fixes the logo height

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoDo not hide the progress bar while the chunked upload is being assembled 11399/head
Daniel Calviño Sánchez [Fri, 7 Sep 2018 14:43:16 +0000 (16:43 +0200)]
Do not hide the progress bar while the chunked upload is being assembled

Large files are not uploaded in a single operation, but uploaded in
several chunks; once all the chunks are uploaded then the server needs
to assemble them to get the final file.

Before, once the chunks were uploaded the progress bar was hidden.
However, this was confusing for the users, as the file could still need
some time to appear in the file list due to the assembling. Now once all
the chunks are uploaded the text in the progress bar changes to inform
the user that there are still some pending operations, and only when the
file is finally assembled the progress bar is hidden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
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 agoFix position of contacts menu shown on mentions 11350/head
Daniel Calviño Sánchez [Sat, 15 Sep 2018 17:53:06 +0000 (19:53 +0200)]
Fix position of contacts menu shown on mentions

There are no default CSS rules for the contacts menu, as its position
depends on the element on which it is shown. Note, however, that if no
explicit rules are provided the contacts menu on mentions is affected by
the rules for the contacts menu on shares from the sharing tab.

The contacts menu is now positioned to show the tip of the arrow
horizontally aligned with the center of the avatar, and with the top of
the menu slightly below the bottom border of the mention.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix contacts menu not triggered on certain areas of a mention
Daniel Calviño Sánchez [Sat, 15 Sep 2018 16:42:52 +0000 (18:42 +0200)]
Fix contacts menu not triggered on certain areas of a mention

The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.

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