]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoMerge pull request #11577 from nextcloud/backport/11185/stable14
Morris Jobke [Wed, 3 Oct 2018 10:58:27 +0000 (12:58 +0200)]
Merge pull request #11577 from nextcloud/backport/11185/stable14

[stable14] Redirect guests to login if they follow the link of a comment mention-notifications

6 years agoRedirect guests to login if they follow the link of a comment mention-notification 11577/head
Joas Schilling [Wed, 12 Sep 2018 09:23:38 +0000 (11:23 +0200)]
Redirect guests to login if they follow the link of a comment mention-notification

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #11558 from nextcloud/stable14-header-overflow
Roeland Jago Douma [Tue, 2 Oct 2018 21:06:17 +0000 (23:06 +0200)]
Merge pull request #11558 from nextcloud/stable14-header-overflow

[stable14] Fix header overflow, fix more apps menu, fix #11552

6 years agoMerge pull request #11556 from nextcloud/stable14-files-list-width-sharing
Morris Jobke [Tue, 2 Oct 2018 19:46:13 +0000 (21:46 +0200)]
Merge pull request #11556 from nextcloud/stable14-files-list-width-sharing

[stable14] Reduce the min-width of the files table so it works on sharing pages on mobile

6 years agoMerge pull request #11554 from nextcloud/backport/11111/fix-app-menu-ios
Morris Jobke [Tue, 2 Oct 2018 19:45:39 +0000 (21:45 +0200)]
Merge pull request #11554 from nextcloud/backport/11111/fix-app-menu-ios

[stable14] Added kinetic scrolling for iOS to apps dropdown menu #10281

6 years agoMerge pull request #11555 from nextcloud/backport/11435/stable14
Roeland Jago Douma [Tue, 2 Oct 2018 19:37:27 +0000 (21:37 +0200)]
Merge pull request #11555 from nextcloud/backport/11435/stable14

throw an error if a node is smaller than expected in assemblystream

6 years agoFix header overflow, fix more apps menu, fix #11552 11558/head
Jan-Christoph Borchardt [Tue, 2 Oct 2018 18:16:20 +0000 (20:16 +0200)]
Fix header overflow, fix more apps menu, fix #11552

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agothrow an error if a node is smaller than expected in assemblystream 11555/head
Robin Appelman [Fri, 28 Sep 2018 13:40:08 +0000 (15:40 +0200)]
throw an error if a node is smaller than expected in assemblystream

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoReduce the min-width of the files table so it works on sharing pages on mobile 11556/head
Jan-Christoph Borchardt [Mon, 1 Oct 2018 10:33:13 +0000 (12:33 +0200)]
Reduce the min-width of the files table so it works on sharing pages on mobile

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoAdded kinetic scrolling for iOS to apps dropdown menu #10281 11554/head
kevin147147 [Fri, 7 Sep 2018 15:47:24 +0000 (17:47 +0200)]
Added kinetic scrolling for iOS to apps dropdown menu #10281

this is tested with nc14

6 years agoMerge pull request #11530 from nextcloud/stb14-brdcrmb-fx
Roeland Jago Douma [Tue, 2 Oct 2018 08:10:58 +0000 (10:10 +0200)]
Merge pull request #11530 from nextcloud/stb14-brdcrmb-fx

Fix breadcrumbs

6 years agoFix breadcrumbs 11530/head
John Molakvoæ (skjnldsv) [Tue, 2 Oct 2018 05:55:17 +0000 (07:55 +0200)]
Fix breadcrumbs

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11525 from nextcloud/fix/11315/filepicker-buttons-nc14
John Molakvoæ [Tue, 2 Oct 2018 05:10:44 +0000 (07:10 +0200)]
Merge pull request #11525 from nextcloud/fix/11315/filepicker-buttons-nc14

[14] Fixes the move/copy picker buttons

6 years agoFixes file/folder move/copy buttons 11525/head
Michael Weimann [Mon, 1 Oct 2018 21:10:14 +0000 (23:10 +0200)]
Fixes file/folder move/copy buttons

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoFix buttons wrapping on long folder names
Jan-Christoph Borchardt [Mon, 1 Oct 2018 18:38:10 +0000 (20:38 +0200)]
Fix buttons wrapping on long folder names

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoMerge pull request #11516 from nextcloud/backport/11515/mimteype-list-update
Roeland Jago Douma [Mon, 1 Oct 2018 19:53:40 +0000 (21:53 +0200)]
Merge pull request #11516 from nextcloud/backport/11515/mimteype-list-update

[stable14] Add missing compiled mimetype list

6 years agoMerge pull request #11511 from nextcloud/stable14-share-header
Roeland Jago Douma [Mon, 1 Oct 2018 15:36:51 +0000 (17:36 +0200)]
Merge pull request #11511 from nextcloud/stable14-share-header

[stable14] Fix share header text on small widths

6 years agoMerge pull request #11510 from nextcloud/stable14-public-footer
Roeland Jago Douma [Mon, 1 Oct 2018 15:36:34 +0000 (17:36 +0200)]
Merge pull request #11510 from nextcloud/stable14-public-footer

[stable14] Fix public page footer link wrap

6 years agoMerge pull request #11505 from nextcloud/drone/14/no_branch_wildcard
Roeland Jago Douma [Mon, 1 Oct 2018 14:43:56 +0000 (16:43 +0200)]
Merge pull request #11505 from nextcloud/drone/14/no_branch_wildcard

[Stable14] Drone: do not check stable* but only stable14

6 years agoAdd missing compiled mimetype list - see #10135 11516/head
Morris Jobke [Mon, 1 Oct 2018 13:54:02 +0000 (15:54 +0200)]
Add missing compiled mimetype list - see #10135

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoRemove non-clickable right margin from 3-dot-menu in share page header 11511/head
Jan-Christoph Borchardt [Mon, 1 Oct 2018 09:50:29 +0000 (11:50 +0200)]
Remove non-clickable right margin from 3-dot-menu in share page header

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoEllipsize long filenames and sharee names in public share page header
Jan-Christoph Borchardt [Mon, 1 Oct 2018 09:49:16 +0000 (11:49 +0200)]
Ellipsize long filenames and sharee names in public share page header

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoFix public page footer link wrap 11510/head
Jan-Christoph Borchardt [Mon, 1 Oct 2018 09:14:31 +0000 (11:14 +0200)]
Fix public page footer link wrap

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoMerge pull request #11492 from nextcloud/backport/11316/container-queryexception...
Morris Jobke [Mon, 1 Oct 2018 12:21:43 +0000 (14:21 +0200)]
Merge pull request #11492 from nextcloud/backport/11316/container-queryexception-only-14

[stable14] only catch QueryException when trying to build class

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 ago[Stable14] Drone: do not check stable* but only stable14 11505/head
Roeland Jago Douma [Mon, 1 Oct 2018 10:12:15 +0000 (12:12 +0200)]
[Stable14] Drone: do not check stable* but only stable14

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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 agoonly catch QueryException when trying to build class 11492/head
Robin Appelman [Fri, 21 Sep 2018 16:32:15 +0000 (18:32 +0200)]
only catch QueryException when trying to build class

Signed-off-by: Robin Appelman <robin@icewind.nl>
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>