]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
5 years agobackport of #10778 11783/head
Stefan Weiberg [Thu, 11 Oct 2018 18:24:36 +0000 (20:24 +0200)]
backport of #10778

Adding a check to see if keyFileContents is empty:

* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
6 years agoMerge pull request #11761 from nextcloud/stable14-11756-ignore-session-lifetime-if...
Morris Jobke [Thu, 11 Oct 2018 11:25:20 +0000 (13:25 +0200)]
Merge pull request #11761 from nextcloud/stable14-11756-ignore-session-lifetime-if-it-can-not-be-converted-to-a-number

[stable14] Ignore "session_lifetime" if it can not be converted to a number

6 years agoIgnore "session_lifetime" if it can not be converted to a number 11761/head
Daniel Calviño Sánchez [Thu, 11 Oct 2018 08:53:25 +0000 (10:53 +0200)]
Ignore "session_lifetime" if it can not be converted to a number

When "session_lifetime" can not be converted to a number the interval
becomes a NaN due to dividing it by 2. This NaN was "dragged" over all
the other mathematical operations and caused the csrftoken to be got
again and again due to an infinite loop with no pauses in "setInterval".
Now, the interval is set to the default value instead if the
"session_lifetime" can not be converted to a number.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #11662 from nextcloud/fix/11468/app-menu-scrollbar-14
Roeland Jago Douma [Thu, 11 Oct 2018 09:38:49 +0000 (11:38 +0200)]
Merge pull request #11662 from nextcloud/fix/11468/app-menu-scrollbar-14

[14] Fixes the apps menu scrollbar

6 years agoMerge pull request #11751 from nextcloud/release/14.0.2 v14.0.2
Morris Jobke [Thu, 11 Oct 2018 07:43:02 +0000 (09:43 +0200)]
Merge pull request #11751 from nextcloud/release/14.0.2

14.0.2

6 years ago14.0.2 11751/head
Roeland Jago Douma [Thu, 11 Oct 2018 06:03:46 +0000 (08:03 +0200)]
14.0.2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14
Morris Jobke [Thu, 11 Oct 2018 06:49:57 +0000 (08:49 +0200)]
Merge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14

[stable14] Fix a misleading setup check for .well-known/caldav & carddav

6 years agoFix a misleading setup check for .well-known/caldav & carddav 11738/head
Morris Jobke [Wed, 10 Oct 2018 08:40:30 +0000 (10:40 +0200)]
Fix a misleading setup check for .well-known/caldav & carddav

The problem is that the version without the slash is the correct one.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 10 Oct 2018 00:13:24 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11715 from nextcloud/version/noid/14.0.2RC2 v14.0.2RC2
Morris Jobke [Tue, 9 Oct 2018 15:59:43 +0000 (17:59 +0200)]
Merge pull request #11715 from nextcloud/version/noid/14.0.2RC2

14.0.2 RC 2

6 years ago14.0.2 RC 2 11715/head
Morris Jobke [Tue, 9 Oct 2018 12:31:37 +0000 (14:31 +0200)]
14.0.2 RC 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14
Morris Jobke [Tue, 9 Oct 2018 13:32:16 +0000 (15:32 +0200)]
Merge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14

Revert "[stable14] in 14 the click action gets lost in the Backbone view."

6 years agoRevert "[stable14] in 14 the click action gets lost in the Backbone view." 11720/head
Morris Jobke [Tue, 9 Oct 2018 13:32:07 +0000 (15:32 +0200)]
Revert "[stable14] in 14 the click action gets lost in the Backbone view."

6 years agoMerge pull request #11684 from nextcloud/backport/10782/stable14
Morris Jobke [Tue, 9 Oct 2018 12:30:57 +0000 (14:30 +0200)]
Merge pull request #11684 from nextcloud/backport/10782/stable14

[stable14] in 14 the click action gets lost in the Backbone view.

6 years agoMerge pull request #11703 from nextcloud/backport/11677/stable14
Morris Jobke [Tue, 9 Oct 2018 11:29:17 +0000 (13:29 +0200)]
Merge pull request #11703 from nextcloud/backport/11677/stable14

[14] Allow the creationg of previews of files stored in appdata

6 years agoMerge pull request #11706 from nextcloud/backport/11705/update-crl
Morris Jobke [Tue, 9 Oct 2018 11:18:42 +0000 (13:18 +0200)]
Merge pull request #11706 from nextcloud/backport/11705/update-crl

[stable14] Update CRL due to changed cert for linkshareex

6 years agoUpdate CRL due to changed cert for linkshareex 11706/head
Morris Jobke [Tue, 9 Oct 2018 09:55:20 +0000 (11:55 +0200)]
Update CRL due to changed cert for linkshareex

See https://github.com/nextcloud/app-certificate-requests/pull/193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAllow the creationg of previews of files stored in appdata 11703/head
Roeland Jago Douma [Mon, 8 Oct 2018 12:35:35 +0000 (14:35 +0200)]
Allow the creationg of previews of files stored in appdata

To allow us to create previews of files stored in appdata we need to
construct the view differently.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 9 Oct 2018 00:12:37 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoin 14 the click action gets lost in the Backbone view. 11684/head
Arthur Schiwon [Tue, 21 Aug 2018 14:28:37 +0000 (16:28 +0200)]
in 14 the click action gets lost in the Backbone view.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 8 Oct 2018 00:13:04 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoFixes the apps menu scrollbar 11662/head
Michael Weimann [Thu, 4 Oct 2018 20:09:28 +0000 (22:09 +0200)]
Fixes the apps menu scrollbar

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 7 Oct 2018 00:12:30 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 6 Oct 2018 00:12:23 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 5 Oct 2018 00:13:09 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11588 from nextcloud/version/noid/14.0.1RC1 14.0.2RC1 v14.0.2RC1
Morris Jobke [Thu, 4 Oct 2018 15:53:32 +0000 (17:53 +0200)]
Merge pull request #11588 from nextcloud/version/noid/14.0.1RC1

14.0.2 RC 1

6 years ago14.0.2 RC 1 11588/head
Morris Jobke [Wed, 3 Oct 2018 13:05:43 +0000 (15:05 +0200)]
14.0.2 RC 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #11610 from nextcloud/bugfix/noid/stable14-fix-call-to-logger
Morris Jobke [Thu, 4 Oct 2018 13:45:04 +0000 (15:45 +0200)]
Merge pull request #11610 from nextcloud/bugfix/noid/stable14-fix-call-to-logger

[14] Fix call to logger

6 years agoAppend error from exception for message 11610/head
Daniel Kesselberg [Wed, 3 Oct 2018 20:20:57 +0000 (22:20 +0200)]
Append error from exception for message

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoMerge pull request #11608 from nextcloud/users-table-header-fix-14
Roeland Jago Douma [Thu, 4 Oct 2018 08:21:48 +0000 (10:21 +0200)]
Merge pull request #11608 from nextcloud/users-table-header-fix-14

[stable14] Fix header border on users list

6 years agoFix header border on users list 11608/head
John Molakvoæ (skjnldsv) [Thu, 4 Oct 2018 07:01:23 +0000 (09:01 +0200)]
Fix header border on users list

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

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 3 Oct 2018 16:58:57 +0000 (16:58 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11582 from nextcloud/stb14-users-table-header-fix
Morris Jobke [Wed, 3 Oct 2018 12:54:37 +0000 (14:54 +0200)]
Merge pull request #11582 from nextcloud/stb14-users-table-header-fix

[stable14] Fix sticky header on users list

6 years agoMerge pull request #11575 from nextcloud/stb14-add-group-settings
Morris Jobke [Wed, 3 Oct 2018 12:53:48 +0000 (14:53 +0200)]
Merge pull request #11575 from nextcloud/stb14-add-group-settings

[stable14] Add new group entry on users list + fixes

6 years agoMerge pull request #11579 from nextcloud/stb14-dropdown-bottom-users-list-fix
Roeland Jago Douma [Wed, 3 Oct 2018 11:36:17 +0000 (13:36 +0200)]
Merge pull request #11579 from nextcloud/stb14-dropdown-bottom-users-list-fix

[stable14] Force multiselect max-height to 5.5 items

6 years agoMerge pull request #11580 from nextcloud/backport/11568/stable14
Roeland Jago Douma [Wed, 3 Oct 2018 11:35:51 +0000 (13:35 +0200)]
Merge pull request #11580 from nextcloud/backport/11568/stable14

[stable14] Just update password hash without validating

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 agoFixed js error 11575/head
John Molakvoæ (skjnldsv) [Wed, 3 Oct 2018 10:02:11 +0000 (12:02 +0200)]
Fixed js error

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix sticky header on users list 11582/head
John Molakvoæ (skjnldsv) [Wed, 3 Oct 2018 10:10:18 +0000 (12:10 +0200)]
Fix sticky header on users list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoJust update password hash without validating 11580/head
Roeland Jago Douma [Tue, 2 Oct 2018 21:31:55 +0000 (23:31 +0200)]
Just update password hash without validating

Fixes #11097

If your password hash changed (becuse your are on 7.2 and we moved to
ARGON2). Then we shold not 'set a new password' but just update the
hash. As else we invoke the password policy again which might lock out
users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoForce multiselect max-height to 5.5 items 11579/head
John Molakvoæ (skjnldsv) [Wed, 3 Oct 2018 06:33:24 +0000 (08:33 +0200)]
Force multiselect max-height to 5.5 items

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
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 agoAdd new group entry on users list + fixes
John Molakvoæ (skjnldsv) [Wed, 12 Sep 2018 15:20:39 +0000 (17:20 +0200)]
Add new group entry on users list + fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.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>