15 Commits d4a44d9b78 ... b466127b1f

Author SHA1 Message Date
  Jan-Christoph Borchardt b466127b1f Merge pull request #16055 from nextcloud/design/native-fonts 4 years ago
  Roeland Jago Douma a47403d5f8 Merge pull request #16021 from nextcloud/bugfix/noid/fall-back-to-black-for-non-color-values 4 years ago
  Roeland Jago Douma da025d4867 Merge pull request #16027 from nextcloud/bugfix/noid/check-if-uploading-is-enabled-before-verifying 4 years ago
  Roeland Jago Douma 2f5810f26e Merge pull request #15832 from nextcloud/bugfix/noid/fulltext-search-groupfolders 4 years ago
  Roeland Jago Douma 0f0dfc837e Merge pull request #15956 from nextcloud/bugfix/noid/fix_checkapp_occ 4 years ago
  Roeland Jago Douma ce642fb0e2 Merge pull request #15970 from nextcloud/dependabot/npm_and_yarn/css-loader-3.0.0 4 years ago
  dependabot-preview[bot] 4a401865f2 Bump css-loader from 2.1.1 to 3.0.0 4 years ago
  Roeland Jago Douma 11b71a143e Merge pull request #16013 from nextcloud/versions-preview-string-id 4 years ago
  Georg Ehrke d814089c6a Fix appid argument for integrity:check-app 4 years ago
  Jan-Christoph Borchardt 97fbf91f29 Use native font stack 4 years ago
  Jan-Christoph Borchardt d14c0f2ed7 Move font from Nunito to Noto Sans 4 years ago
  Joas Schilling 12c7ebe30f Check if uploading to lookup server is enabled before verifying 4 years ago
  Joas Schilling 05381f00d2 Fall back to black for non-color values 4 years ago
  Robin Appelman 9b8f2f4192 fix previews and rollback of versions with non numeric version ids 4 years ago
  Morris Jobke 9dac9710e4 Fix full text search for groupfolders 4 years ago
78 changed files with 130 additions and 207 deletions
  1. 3 10
      apps/accessibility/css/fontdyslexic.scss
  2. 0 0
      apps/comments/js/comments.js
  3. 0 0
      apps/comments/js/comments.js.map
  4. 0 0
      apps/files_sharing/js/dist/additionalScripts.js
  5. 0 0
      apps/files_sharing/js/dist/additionalScripts.js.map
  6. 0 0
      apps/files_trashbin/js/files_trashbin.js
  7. 0 0
      apps/files_trashbin/js/files_trashbin.js.map
  8. 0 0
      apps/files_versions/js/files_versions.js
  9. 0 0
      apps/files_versions/js/files_versions.js.map
  10. 1 1
      apps/files_versions/src/templates/item.handlebars
  11. 1 1
      apps/files_versions/src/versioncollection.js
  12. 1 1
      apps/files_versions/src/versionmodel.js
  13. 1 1
      apps/files_versions/src/versionstabview.js
  14. 0 0
      apps/oauth2/js/oauth2.js
  15. 0 0
      apps/oauth2/js/oauth2.js.map
  16. 0 0
      apps/systemtags/js/systemtags.js
  17. 0 0
      apps/systemtags/js/systemtags.js.map
  18. 0 0
      apps/twofactor_backupcodes/js/settings.js
  19. 0 0
      apps/twofactor_backupcodes/js/settings.js.map
  20. 0 0
      apps/updatenotification/js/updatenotification.js
  21. 0 0
      apps/updatenotification/js/updatenotification.js.map
  22. 1 1
      apps/user_ldap/css/renewPassword.css
  23. 2 2
      core/Command/Integrity/CheckApp.php
  24. 1 0
      core/Controller/SvgController.php
  25. 0 43
      core/css/fonts.scss
  26. 2 47
      core/css/guest.css
  27. 0 1
      core/css/server.scss
  28. 1 1
      core/css/tooltip.scss
  29. 1 1
      core/css/variables.scss
  30. 25 26
      core/fonts/LICENSE_OFL.txt
  31. BIN
      core/fonts/NotoSans-Bold-cyrillic-ext.woff2
  32. BIN
      core/fonts/NotoSans-Bold-cyrillic.woff2
  33. BIN
      core/fonts/NotoSans-Bold-devanagari.woff2
  34. BIN
      core/fonts/NotoSans-Bold-greek-ext.woff2
  35. BIN
      core/fonts/NotoSans-Bold-greek.woff2
  36. BIN
      core/fonts/NotoSans-Bold-latin-ext.woff2
  37. BIN
      core/fonts/NotoSans-Bold-latin.woff2
  38. BIN
      core/fonts/NotoSans-Bold-vietnamese.woff2
  39. BIN
      core/fonts/NotoSans-Bold.ttf
  40. BIN
      core/fonts/NotoSans-Regular-cyrillic-ext.woff2
  41. BIN
      core/fonts/NotoSans-Regular-cyrillic.woff2
  42. BIN
      core/fonts/NotoSans-Regular-devanagari.woff2
  43. BIN
      core/fonts/NotoSans-Regular-greek-ext.woff2
  44. BIN
      core/fonts/NotoSans-Regular-greek.woff2
  45. BIN
      core/fonts/NotoSans-Regular-latin-ext.woff2
  46. BIN
      core/fonts/NotoSans-Regular-latin.woff2
  47. BIN
      core/fonts/NotoSans-Regular-vietnamese.woff2
  48. BIN
      core/fonts/NotoSans-Regular.ttf
  49. BIN
      core/fonts/Nunito-Bold-latin-ext.woff2
  50. BIN
      core/fonts/Nunito-Bold.ttf
  51. BIN
      core/fonts/Nunito-Bold.woff2
  52. BIN
      core/fonts/Nunito-Regular-latin-ext.woff2
  53. BIN
      core/fonts/Nunito-Regular.ttf
  54. BIN
      core/fonts/Nunito-Regular.woff2
  55. 0 0
      core/js/dist/login.js
  56. 0 0
      core/js/dist/login.js.map
  57. 0 0
      core/js/dist/main.js
  58. 0 0
      core/js/dist/main.js.map
  59. 0 0
      core/js/dist/systemtags.js
  60. 0 0
      core/js/dist/systemtags.js.map
  61. 2 2
      core/js/tests/specs/setupchecksSpec.js
  62. 5 5
      lib/private/Avatar/Avatar.php
  63. 2 2
      lib/private/Files/View.php
  64. 1 1
      lib/private/Preview/TXT.php
  65. 3 0
      lib/private/Share20/Manager.php
  66. 5 0
      lib/private/Template/IconsCacher.php
  67. 66 57
      package-lock.json
  68. 1 1
      package.json
  69. 3 1
      settings/BackgroundJobs/VerifyUserData.php
  70. 1 1
      settings/js/admin.js
  71. 0 0
      settings/js/vue-4.js.map
  72. 0 0
      settings/js/vue-5.js
  73. 0 0
      settings/js/vue-5.js.map
  74. 0 0
      settings/js/vue-settings-admin-security.js
  75. 0 0
      settings/js/vue-settings-admin-security.js.map
  76. 0 0
      settings/js/vue-settings-personal-security.js
  77. 0 0
      settings/js/vue-settings-personal-security.js.map
  78. 1 1
      tests/lib/Avatar/UserAvatarTest.php

+ 3 - 10
apps/accessibility/css/fontdyslexic.scss

@@ -1,22 +1,15 @@
 @font-face {
 	font-family: 'OpenDyslexic';
 	font-style: normal;
-	font-weight: 300;
+	font-weight: 400;
 	src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
 }
 
 @font-face {
 	font-family: 'OpenDyslexic';
 	font-style: normal;
-	font-weight: normal;
-	src: url('../fonts/OpenDyslexic-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'OpenDyslexic';
-	font-style: normal;
-	font-weight: 600;
+	font-weight: 700;
 	src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
 }
 
-$font-face: OpenDyslexic, 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+$font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';

File diff suppressed because it is too large
+ 0 - 0
apps/comments/js/comments.js


File diff suppressed because it is too large
+ 0 - 0
apps/comments/js/comments.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/files_sharing/js/dist/additionalScripts.js


File diff suppressed because it is too large
+ 0 - 0
apps/files_sharing/js/dist/additionalScripts.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/files_trashbin/js/files_trashbin.js


File diff suppressed because it is too large
+ 0 - 0
apps/files_trashbin/js/files_trashbin.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/files_versions/js/files_versions.js


File diff suppressed because it is too large
+ 0 - 0
apps/files_versions/js/files_versions.js.map


+ 1 - 1
apps/files_versions/src/templates/item.handlebars

@@ -1,4 +1,4 @@
-<li data-revision="{{timestamp}}">
+<li data-revision="{{id}}">
 	<div>
 		<div class="preview-container">
 			<img class="preview" src="{{previewUrl}}" width="44" height="44"/>

+ 1 - 1
apps/files_versions/src/versioncollection.js

@@ -68,7 +68,7 @@
 				version.fileId = fileId;
 				version.name = name;
 				version.timestamp = parseInt(moment(new Date(version.timestamp)).format('X'), 10);
-				version.id = parseInt(OC.basename(version.href), 10);
+				version.id = OC.basename(version.href);
 				version.size = parseInt(version.size, 10);
 				version.user = user;
 				version.client = client;

+ 1 - 1
apps/files_versions/src/versionmodel.js

@@ -55,7 +55,7 @@
 			var url = OC.generateUrl('/apps/files_versions/preview');
 			var params = {
 				file: this.get('fullPath'),
-				version: this.get('timestamp')
+				version: this.get('id')
 			};
 			return url + '?' + OC.buildQueryString(params);
 		},

+ 1 - 1
apps/files_versions/src/versionstabview.js

@@ -156,7 +156,7 @@ import Template from './templates/template.handlebars';
 			var preview = OC.MimeType.getIconUrl(version.get('mimetype'));
 			var img = new Image();
 			img.onload = function () {
-				$('li[data-revision=' + version.get('timestamp') + '] .preview').attr('src', version.getPreviewUrl());
+				$('li[data-revision=' + version.get('id') + '] .preview').attr('src', version.getPreviewUrl());
 			};
 			img.src = version.getPreviewUrl();
 

File diff suppressed because it is too large
+ 0 - 0
apps/oauth2/js/oauth2.js


File diff suppressed because it is too large
+ 0 - 0
apps/oauth2/js/oauth2.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/systemtags/js/systemtags.js


File diff suppressed because it is too large
+ 0 - 0
apps/systemtags/js/systemtags.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/twofactor_backupcodes/js/settings.js


File diff suppressed because it is too large
+ 0 - 0
apps/twofactor_backupcodes/js/settings.js.map


File diff suppressed because it is too large
+ 0 - 0
apps/updatenotification/js/updatenotification.js


File diff suppressed because it is too large
+ 0 - 0
apps/updatenotification/js/updatenotification.js.map


+ 1 - 1
apps/user_ldap/css/renewPassword.css

@@ -22,7 +22,7 @@
 .tooltip {
 	position:absolute;
 	display:block;
-	font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 	font-style:normal;
 	font-weight:400;
 	letter-spacing:normal;

+ 2 - 2
core/Command/Integrity/CheckApp.php

@@ -45,7 +45,7 @@ class CheckApp extends Base {
 		parent::__construct();
 		$this->checker = $checker;
 	}
-	
+
 	/**
 	 * {@inheritdoc }
 	 */
@@ -54,7 +54,7 @@ class CheckApp extends Base {
 		$this
 			->setName('integrity:check-app')
 			->setDescription('Check integrity of an app using a signature.')
-			->addArgument('appid', null, InputArgument::REQUIRED, 'Application to check')
+			->addArgument('appid', InputArgument::REQUIRED, 'Application to check')
 			->addOption('path', null, InputOption::VALUE_OPTIONAL, 'Path to application. If none is given it will be guessed.');
 	}
 

+ 1 - 0
core/Controller/SvgController.php

@@ -111,6 +111,7 @@ class SvgController extends Controller {
 	 *
 	 * @param string $path
 	 * @param string $color
+	 * @param string $fileName
 	 * @return DataDisplayResponse|NotFoundResponse
 	 */
 	private function getSvg(string $path, string $color, string $fileName) {

+ 0 - 43
core/css/fonts.scss

@@ -1,43 +0,0 @@
-/* latin-ext */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 400; /* normal */
-	src: local('Nunito Regular'), local('Nunito-Regular'),
-		url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
-		url('../fonts/Nunito-Regular.ttf') format('truetype');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 400; /* normal */
-	src: local('Nunito Regular'), local('Nunito-Regular'),
-		url('../fonts/Nunito-Regular.woff2') format('woff2'),
-		url('../fonts/Nunito-Regular.ttf') format('truetype');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 700; /* bold */
-	src: local('Nunito Bold'), local('Nunito-Bold'),
-		url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
-		url('../fonts/Nunito-Bold.ttf') format('truetype');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 700; /* bold */
-	src: local('Nunito Bold'), local('Nunito-Bold'),
-		url('../fonts/Nunito-Bold.woff2') format('woff2'),
-		url('../fonts/Nunito-Bold.ttf') format('truetype');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}

+ 2 - 47
core/css/guest.css

@@ -19,7 +19,7 @@ body {
 	font-weight: normal;
 	font-size: .8em;
 	line-height: 1.6em;
-	font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 	color: #000;
 	text-align: center;
 	background-color: #0082c9;
@@ -183,7 +183,7 @@ form #datadirField legend {
 
 
 input, textarea, select, button, div[contenteditable=true] {
-	font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 }
 input,
 input:not([type='range']),
@@ -848,48 +848,3 @@ label.infield,
 a.legal {
 	font-size: smaller;
 }
-
-
-/* latin-ext */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 400; /* normal */
-	src: local('Nunito Regular'), local('Nunito-Regular'),
-		url('../fonts/Nunito-Regular-latin-ext.woff2') format('woff2'),
-		url('../fonts/Nunito-Regular.ttf') format('truetype');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 400; /* normal */
-	src: local('Nunito Regular'), local('Nunito-Regular'),
-		url('../fonts/Nunito-Regular.woff2') format('woff2'),
-		url('../fonts/Nunito-Regular.ttf') format('truetype');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-/* latin-ext */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 700; /* bold */
-	src: local('Nunito Bold'), local('Nunito-Bold'),
-		url('../fonts/Nunito-Bold-latin-ext.woff2') format('woff2'),
-		url('../fonts/Nunito-Bold.ttf') format('truetype');
-	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
-
-/* latin */
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 700; /* bold */
-	src: local('Nunito Bold'), local('Nunito-Bold'),
-		url('../fonts/Nunito-Bold.woff2') format('woff2'),
-		url('../fonts/Nunito-Bold.ttf') format('truetype');
-	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}

+ 0 - 1
core/css/server.scss

@@ -2,7 +2,6 @@
 @import 'inputs.scss';
 @import 'header.scss';
 @import 'icons.scss';
-@import 'fonts.scss';
 @import 'apps.scss';
 @import 'global.scss';
 @import 'fixes.scss';

+ 1 - 1
core/css/tooltip.scss

@@ -13,7 +13,7 @@
 .tooltip {
     position: absolute;
     display: block;
-    font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+    font-family: var(--font-face);
     font-style: normal;
     font-weight: normal;
     letter-spacing: normal;

+ 1 - 1
core/css/variables.scss

@@ -79,7 +79,7 @@ $border-radius-large: 10px !default;
 // Pill-style button, value is large so big buttons also have correct roundness
 $border-radius-pill: 100px !default;
 
-$font-face: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;
+$font-face: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 
 $animation-quick: 100ms;
 $animation-slow: 300ms;

+ 25 - 26
core/fonts/OFL.txt → core/fonts/LICENSE_OFL.txt

@@ -1,29 +1,28 @@
-Copyright 2014 The Nunito Project Authors (contact@sansoxygen.com)
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
 
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
 http://scripts.sil.org/OFL
 
-
 -----------------------------------------------------------
 SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
 -----------------------------------------------------------
 
 PREAMBLE
 The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
 
 DEFINITIONS
 "Font Software" refers to the set of files released by the Copyright
@@ -33,25 +32,25 @@ include source files, build scripts and documentation.
 "Reserved Font Name" refers to any names specified as such after the
 copyright statement(s).
 
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
 
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
 
 "Author" refers to any designer, engineer, programmer, technical
 writer or other person who contributed to the Font Software.
 
 PERMISSION & CONDITIONS
 Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
 
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
 
 2) Original or Modified Versions of the Font Software may be bundled,
 redistributed and/or sold with any software, provided that each copy
@@ -61,9 +60,9 @@ in the appropriate machine-readable metadata fields within text or
 binary files as long as those fields can be easily viewed by the user.
 
 3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
 
 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
 Software shall not be used to promote, endorse or advertise any
@@ -74,8 +73,8 @@ permission.
 5) The Font Software, modified or unmodified, in part or in whole,
 must be distributed entirely under this license, and must not be
 distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
+remain under this license does not apply to any document created using
+the Font Software.
 
 TERMINATION
 This license becomes null and void if any of the above conditions are

BIN
core/fonts/NotoSans-Bold-cyrillic-ext.woff2


BIN
core/fonts/NotoSans-Bold-cyrillic.woff2


BIN
core/fonts/NotoSans-Bold-devanagari.woff2


BIN
core/fonts/NotoSans-Bold-greek-ext.woff2


BIN
core/fonts/NotoSans-Bold-greek.woff2


BIN
core/fonts/NotoSans-Bold-latin-ext.woff2


BIN
core/fonts/NotoSans-Bold-latin.woff2


BIN
core/fonts/NotoSans-Bold-vietnamese.woff2


BIN
core/fonts/NotoSans-Bold.ttf


BIN
core/fonts/NotoSans-Regular-cyrillic-ext.woff2


BIN
core/fonts/NotoSans-Regular-cyrillic.woff2


BIN
core/fonts/NotoSans-Regular-devanagari.woff2


BIN
core/fonts/NotoSans-Regular-greek-ext.woff2


BIN
core/fonts/NotoSans-Regular-greek.woff2


BIN
core/fonts/NotoSans-Regular-latin-ext.woff2


BIN
core/fonts/NotoSans-Regular-latin.woff2


BIN
core/fonts/NotoSans-Regular-vietnamese.woff2


BIN
core/fonts/NotoSans-Regular.ttf


BIN
core/fonts/Nunito-Bold-latin-ext.woff2


BIN
core/fonts/Nunito-Bold.ttf


BIN
core/fonts/Nunito-Bold.woff2


BIN
core/fonts/Nunito-Regular-latin-ext.woff2


BIN
core/fonts/Nunito-Regular.ttf


BIN
core/fonts/Nunito-Regular.woff2


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/login.js


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/login.js.map


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/main.js


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/main.js.map


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/systemtags.js


File diff suppressed because it is too large
+ 0 - 0
core/js/dist/systemtags.js.map


+ 2 - 2
core/js/tests/specs/setupchecksSpec.js

@@ -145,7 +145,7 @@ describe('OC.SetupChecks tests', function() {
 
 	describe('checkWOFF2Loading', function() {
 		it('should fail with another response status code than the expected one', function(done) {
-			var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');
+			var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), 'http://example.org/PLACEHOLDER');
 
 			suite.server.requests[0].respond(302);
 
@@ -159,7 +159,7 @@ describe('OC.SetupChecks tests', function() {
 		});
 
 		it('should return no error with the expected response status code', function(done) {
-			var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');
+			var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), 'http://example.org/PLACEHOLDER');
 
 			suite.server.requests[0].respond(200);
 

+ 5 - 5
lib/private/Avatar/Avatar.php

@@ -50,8 +50,8 @@ abstract class Avatar implements IAvatar {
 	/**
 	 * https://github.com/sebdesign/cap-height -- for 500px height
 	 * Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
-	 * Nunito cap-height is 0.716 and we want a 200px caps height size
-	 * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.716 = 279px.
+	 * Noto Sans cap-height is 0.715 and we want a 200px caps height size
+	 * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.715 = 280px.
 	 * Since we start from the baseline (text-anchor) we need to
 	 * shift the y axis by 100px (half the caps height): 500/2+100=350
 	 *
@@ -60,7 +60,7 @@ abstract class Avatar implements IAvatar {
 	private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 		<svg width="{size}" height="{size}" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
 			<rect width="100%" height="100%" fill="#{fill}"></rect>
-			<text x="50%" y="350" style="font-weight:normal;font-size:279px;font-family:\'Nunito\';text-anchor:middle;fill:#fff">{letter}</text>
+			<text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">{letter}</text>
 		</svg>';
 
 	/**
@@ -141,7 +141,7 @@ abstract class Avatar implements IAvatar {
 			return false;
 		}
 		try {
-			$font = __DIR__ . '/../../core/fonts/Nunito-Regular.ttf';
+			$font = __DIR__ . '/../../core/fonts/NotoSans-Regular.ttf';
 			$svg = $this->getAvatarVector($size);
 			$avatar = new Imagick();
 			$avatar->setFont($font);
@@ -176,7 +176,7 @@ abstract class Avatar implements IAvatar {
 		$white = imagecolorallocate($im, 255, 255, 255);
 		imagefilledrectangle($im, 0, 0, $size, $size, $background);
 
-		$font = __DIR__ . '/../../../core/fonts/Nunito-Regular.ttf';
+		$font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
 
 		$fontSize = $size * 0.4;
 		list($x, $y) = $this->imageTTFCenter(

+ 2 - 2
lib/private/Files/View.php

@@ -1933,7 +1933,7 @@ class View {
 		if ($mount) {
 			try {
 				$storage = $mount->getStorage();
-				if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+				if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
 					$storage->acquireLock(
 						$mount->getInternalPath($absolutePath),
 						$type,
@@ -1974,7 +1974,7 @@ class View {
 		if ($mount) {
 			try {
 				$storage = $mount->getStorage();
-				if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+				if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
 					$storage->changeLock(
 						$mount->getInternalPath($absolutePath),
 						$type,

+ 1 - 1
lib/private/Preview/TXT.php

@@ -74,7 +74,7 @@ class TXT extends ProviderV2 {
 
 		$fontFile  = __DIR__;
 		$fontFile .= '/../../../core';
-		$fontFile .= '/fonts/Nunito-Regular.ttf';
+		$fontFile .= '/fonts/NotoSans-Regular.ttf';
 
 		$canUseTTF = function_exists('imagettftext');
 

+ 3 - 0
lib/private/Share20/Manager.php

@@ -1430,6 +1430,9 @@ class Manager implements IManager {
 		if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
 			$nodes = $userFolder->getById($path->getId());
 			$path = array_shift($nodes);
+			if ($path->getOwner() === null) {
+				return [];
+			}
 			$owner = $path->getOwner()->getUID();
 		}
 

+ 5 - 0
lib/private/Template/IconsCacher.php

@@ -184,6 +184,11 @@ class IconsCacher {
 	 * @return string
 	 */
 	public function colorizeSvg($svg, $color): string {
+		if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
+			// Prevent not-sane colors from being written into the SVG
+			$color = '000';
+		}
+
 		// add fill (fill is not present on black elements)
 		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
 		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);

+ 66 - 57
package-lock.json

@@ -2333,21 +2333,22 @@
       }
     },
     "css-loader": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
-      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.0.0.tgz",
+      "integrity": "sha512-WR6KZuCkFbnMhRrGPlkwAA7SSCtwqPwpyXJAPhotYkYsc0mKU9n/fu5wufy4jl2WhBw9Ia8gUQMIp/1w98DuPw==",
       "dev": true,
       "requires": {
-        "camelcase": "^5.2.0",
-        "icss-utils": "^4.1.0",
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
         "loader-utils": "^1.2.3",
         "normalize-path": "^3.0.0",
-        "postcss": "^7.0.14",
+        "postcss": "^7.0.17",
         "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.6",
+        "postcss-modules-local-by-default": "^3.0.2",
         "postcss-modules-scope": "^2.1.0",
-        "postcss-modules-values": "^2.0.0",
-        "postcss-value-parser": "^3.3.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.0",
         "schema-utils": "^1.0.0"
       },
       "dependencies": {
@@ -2357,32 +2358,24 @@
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-        },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+        "postcss": {
+          "version": "7.0.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
+          "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
+          "dev": true,
           "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
           }
         },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
           "requires": {
-            "jsesc": "~0.5.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -3662,9 +3655,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -4064,16 +4057,10 @@
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
     "icss-utils": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.0.tgz",
-      "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.14"
@@ -5649,16 +5636,28 @@
       }
     },
     "postcss-modules-local-by-default": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
-      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
+      "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0",
-        "postcss-value-parser": "^3.3.1"
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.16",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.0"
       },
       "dependencies": {
+        "postcss": {
+          "version": "7.0.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
+          "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
         "postcss-selector-parser": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
@@ -5669,6 +5668,15 @@
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -5696,12 +5704,12 @@
       }
     },
     "postcss-modules-values": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
-      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "^1.1.0",
+        "icss-utils": "^4.0.0",
         "postcss": "^7.0.6"
       }
     },
@@ -5725,9 +5733,9 @@
       }
     },
     "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz",
+      "integrity": "sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==",
       "dev": true
     },
     "prettier": {
@@ -6074,7 +6082,8 @@
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
     },
     "regenerate-unicode-properties": {
       "version": "8.1.0",

+ 1 - 1
package.json

@@ -68,7 +68,7 @@
     "babel-loader": "^8.0.6",
     "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
     "browserslist-config-nextcloud": "0.0.1",
-    "css-loader": "^2.1.1",
+    "css-loader": "^3.0.0",
     "exports-loader": "^0.7.0",
     "file-loader": "^4.0.0",
     "handlebars-loader": "^1.7.1",

+ 3 - 1
settings/BackgroundJobs/VerifyUserData.php

@@ -186,7 +186,9 @@ class VerifyUserData extends Job {
 	 * @return bool true if we could check the verification code, otherwise false
 	 */
 	protected function verifyViaLookupServer(array $argument, $dataType) {
-		if(empty($this->lookupServerUrl) || $this->config->getSystemValue('has_internet_connection', true) === false) {
+		if(empty($this->lookupServerUrl) ||
+			$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
+			$this->config->getSystemValue('has_internet_connection', true) === false) {
 			return false;
 		}
 

+ 1 - 1
settings/js/admin.js

@@ -255,7 +255,7 @@ $(document).ready(function(){
 			OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
 			OC.SetupChecks.checkSetup(),
 			OC.SetupChecks.checkGeneric(),
-			OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), OC.theme.docPlaceholderUrl),
+			OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl),
 			OC.SetupChecks.checkDataProtected()
 		).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) {
 			var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10);

File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-4.js.map


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-5.js


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-5.js.map


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-settings-admin-security.js


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-settings-admin-security.js.map


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-settings-personal-security.js


File diff suppressed because it is too large
+ 0 - 0
settings/js/vue-settings-personal-security.js.map


+ 1 - 1
tests/lib/Avatar/UserAvatarTest.php

@@ -235,7 +235,7 @@ class UserAvatarTest extends \Test\TestCase {
 		$svg = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 		<svg width="64" height="64" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
 			<rect width="100%" height="100%" fill="#0082c9"></rect>
-			<text x="50%" y="350" style="font-weight:normal;font-size:279px;font-family:\'Nunito\';text-anchor:middle;fill:#fff">A</text>
+			<text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">A</text>
 		</svg>';
 		$this->assertEquals($avatar, $svg);
 	}

Some files were not shown because too many files changed in this diff