Merge branch 'main' into auto-merge_webUI

Author: 6543

assets/favicon.svg

@@ -8,6 +8,7 @@ import {fileURLToPath} from 'url';
 const {readFile, writeFile} = fs.promises;
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const logoFile = resolve(__dirname, '../assets/logo.svg');
+const faviconFile = resolve(__dirname, '../assets/favicon.svg');
 
 function exit(err) {
   if (err) console.error(err);
@@ -68,15 +69,17 @@ async function generate(svg, outputFile, {size, bg}) {
 
 async function main() {
   const gitea = process.argv.slice(2).includes('gitea');
-  const svg = await readFile(logoFile, 'utf8');
+  const logoSvg = await readFile(logoFile, 'utf8');
+  const faviconSvg = await readFile(faviconFile, 'utf8');
 
   await Promise.all([
-    generate(svg, resolve(__dirname, '../public/img/logo.svg'), {size: 32}),
-    generate(svg, resolve(__dirname, '../public/img/logo.png'), {size: 512}),
-    generate(svg, resolve(__dirname, '../public/img/favicon.png'), {size: 180}),
-    generate(svg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200}),
-    generate(svg, resolve(__dirname, '../public/img/apple-touch-icon.png'), {size: 180, bg: true}),
-    gitea && generate(svg, resolve(__dirname, '../public/img/gitea.svg'), {size: 32}),
+    generate(logoSvg, resolve(__dirname, '../public/img/logo.svg'), {size: 32}),
+    generate(logoSvg, resolve(__dirname, '../public/img/logo.png'), {size: 512}),
+    generate(faviconSvg, resolve(__dirname, '../public/img/favicon.svg'), {size: 32}),
+    generate(faviconSvg, resolve(__dirname, '../public/img/favicon.png'), {size: 180}),
+    generate(logoSvg, resolve(__dirname, '../public/img/avatar_default.png'), {size: 200}),
+    generate(logoSvg, resolve(__dirname, '../public/img/apple-touch-icon.png'), {size: 180, bg: true}),
+    gitea && generate(logoSvg, resolve(__dirname, '../public/img/gitea.svg'), {size: 32}),
   ]);
 }
 

build/generate-images.js

@@ -60,14 +60,15 @@ the url `http://gitea.domain.tld/assets/image.png`.
 
 ## Changing the logo
 
-To build a custom logo clone the Gitea source repository, replace `assets/logo.svg` and run
-`make generate-images`. This will update below output files which you can then place in `$GITEA_CUSTOM/public/img` on your server:
+To build a custom logo and/or favicon clone the Gitea source repository, replace `assets/logo.svg` and/or `assets/favicon.svg` and run
+`make generate-images`. `assets/favicon.svg` is used for the favicon only. This will update below output files which you can then place in `$GITEA_CUSTOM/public/img` on your server:
 
-- `public/img/logo.svg` - Used for favicon, site icon, app icon
+- `public/img/logo.svg` - Used for site icon, app icon
 - `public/img/logo.png` - Used for Open Graph
-- `public/img/favicon.png` - Used as fallback for browsers that don't support SVG favicons
 - `public/img/avatar_default.png` - Used as the default avatar image
 - `public/img/apple-touch-icon.png` - Used on iOS devices for bookmarks
+- `public/img/favicon.svg` - Used for favicon
+- `public/img/favicon.png` - Used as fallback for browsers that don't support SVG favicons
 
 In case the source image is not in vector format, you can attempt to convert a raster image using tools like [this](https://www.aconvert.com/image/png-to-svg/).
 

docs/content/doc/advanced/customizing-gitea.en-us.md

@@ -11,6 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 
 	"xorm.io/builder"
+	"xorm.io/xorm/schemas"
 )
 
 // DefaultContext is the default context to run xorm queries in
@@ -175,3 +176,24 @@ func CountByBean(ctx context.Context, bean interface{}) (int64, error) {
 func TableName(bean interface{}) string {
 	return x.TableName(bean)
 }
+
+// EstimateCount returns an estimate of total number of rows in table
+func EstimateCount(ctx context.Context, bean interface{}) (int64, error) {
+	e := GetEngine(ctx)
+	e.Context(ctx)
+
+	var rows int64
+	var err error
+	tablename := TableName(bean)
+	switch x.Dialect().URI().DBType {
+	case schemas.MYSQL:
+		_, err = e.Context(ctx).SQL("SELECT table_rows FROM information_schema.tables WHERE tables.table_name = ? AND tables.table_schema = ?;", tablename, x.Dialect().URI().DBName).Get(&rows)
+	case schemas.POSTGRES:
+		_, err = e.Context(ctx).SQL("SELECT reltuples AS estimate FROM pg_class WHERE relname = ?;", tablename).Get(&rows)
+	case schemas.MSSQL:
+		_, err = e.Context(ctx).SQL("sp_spaceused ?;", tablename).Get(&rows)
+	default:
+		return e.Context(ctx).Count(tablename)
+	}
+	return rows, err
+}

models/db/context.go

@@ -56,7 +56,7 @@ func GetStatistic() (stats Statistic) {
 	stats.Counter.Repo, _ = repo_model.CountRepositories(db.DefaultContext, repo_model.CountRepositoryOptions{})
 	stats.Counter.Watch, _ = e.Count(new(repo_model.Watch))
 	stats.Counter.Star, _ = e.Count(new(repo_model.Star))
-	stats.Counter.Action, _ = e.Count(new(Action))
+	stats.Counter.Action, _ = db.EstimateCount(db.DefaultContext, new(Action))
 	stats.Counter.Access, _ = e.Count(new(access_model.Access))
 
 	type IssueCount struct {

models/statistic.go

@@ -39,11 +39,14 @@
 #ignore umbraco backoffice assest from wwwroot
 **/wwwroot/umbraco/
 
+# SQLite files
+*.sqlite.db*
+
 #ignore umbraco data/views/settings
 **/umbraco/
 
 #include default location for modelsbuilder output
 !**/umbraco/models
 
 #include default location for packages
-!**/umbraco/Data/packages
+!**/umbraco/Data/packages

options/gitignore/Umbraco

@@ -0,0 +1,15 @@
+Copyright Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.

options/license/Bitstream-Vera

@@ -2323,7 +2323,6 @@ total=Celkem: %d
 dashboard.statistic=Souhrn
 dashboard.operations=Operace údržby
 dashboard.system_status=Status systému
-dashboard.statistic_info=Databáze Gitea obsahuje <b>%d</b> uživatelů, <b>%d</b> organizací, <b>%d</b> veřejných klíčů, <b>%d</b> repozitářů, <b>%d</b> hlídání, <b>%d</b> oblíbení, <b>%d</b> akcí, <b>%d</b> přístupů, <b>%d</b> úkolů, <b>%d</b> komentářů, <b>%d</b> účtů sociálních sítí, <b>%d</b> sledování, <b>%d</b> zrcadel, <b>%d</b> vydání, <b>%d</b> zdrojů ověřování, <b>%d</b> webových háčků, <b>%d</b> milníků, <b>%d</b> štítků, <b>%d</b> háčků, <b>%d</b> týmů, <b>%d</b> úkolů změn, <b>%d</b> příloh.
 dashboard.operation_name=Název operace
 dashboard.operation_switch=Přepnout
 dashboard.operation_run=Spustit

options/locale/locale_cs-CZ.ini

@@ -2360,7 +2360,6 @@ total=Gesamt: %d
 dashboard.statistic=Übersicht
 dashboard.operations=Wartungsoperationen
 dashboard.system_status=System-Status
-dashboard.statistic_info=Giteas Datenbank hat <b>%d</b> Benutzer, <b>%d</b> Organisationen, <b>%d</b> öffentliche Schlüssel, <b>%d</b> Repositorys, <b>%d</b> Beobachtungen, <b>%d</b> Favoriten, <b>%d</b> Aktionen, <b>%d</b> Zugriffe, <b>%d</b> Issues, <b>%d</b> Kommentare, <b>%d</b> Konten sozialer Netzwerke, <b>%d</b> Gefolgte, <b>%d</b> Mirrors, <b>%d</b> Releases, <b>%d</b> Login-Quellen, <b>%d</b> Webhooks, <b>%d</b> Meilensteine, <b>%d</b> Label, <b>%d</b> Hook-Tasks, <b>%d</b> Teams, <b>%d</b> Aktualisierungs-Tasks, <b>%d</b> Anhänge.
 dashboard.operation_name=Name der Operation
 dashboard.operation_switch=Wechseln
 dashboard.operation_run=Ausführen

options/locale/locale_de-DE.ini

@@ -2362,7 +2362,6 @@ total=Σύνολο: %d
 dashboard.statistic=Περίληψη
 dashboard.operations=Λειτουργίες Συντήρησης
 dashboard.system_status=Κατάσταση Συστήματος
-dashboard.statistic_info=Η βάση δεδομένων του Gitea περιέχει <b>%d</b> χρήστες, <b>%d</b> οργανισμούς, <b>%d</b> δημόσια κλειδιά, <b>%d</b> αποθετήρια, <b>%d</b> παρακολουθήσεις, <b>%d</b> αστέρια, <b>%d</b> δράσεις, <b>%d</b> προσβάσεις, <b>%d</b> ζητήματα, <b>%d</b> σχόλια, <b>%d</b> λογαριασμούς κοινωνικών, <b>%d</b> ακόλουθους, <b>%d</b> είδωλα, <b>%d</b> εκδόσεις, <b>%d</b> πηγές ταυτοποίησης, <b>%d</b> webhooks, <b>%d</b> ορόσημα, <b>%d</b> σήματα, <b>%d</b> εργασίες hook, <b>%d</b> ομάδες, <b>%d</b> εργασίες ενημέρωσης, <b>%d</b> συνημμένα.
 dashboard.operation_name=Όνομα Λειτουργίας
 dashboard.operation_switch=Αλλαγή
 dashboard.operation_run=Εκτέλεση