mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into issue2757

This commit is contained in:
nicolargo 2024-12-28 13:52:42 +01:00
parent 3ec94d32f0 ef602ac59e
commit b4402bfc53
9 changed files with 309 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS.rst
View File

@ -6,6 +6,14 @@
Version 4.3.0.4 Version 4.3.0.4
=============== ===============
Bug corrected:
* WebUI errors in 4.3.0.4 on iPad Air (and Browser with low resolution) #3057
===============
Version 4.3.0.4
===============
Continuous integration and documentation: Continuous integration and documentation:
* Pin Python version in Ubuntu image to 3.12 * Pin Python version in Ubuntu image to 3.12

566
docs/api.rst
View File

File diff suppressed because it is too large Load Diff

2
docs/man/glances.1
View File

@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
.. ..
.TH "GLANCES" "1" "Dec 28, 2024" "4.3.0.4" "Glances" .TH "GLANCES" "1" "Dec 28, 2024" "4.3.0.5" "Glances"
.SH NAME .SH NAME
glances \- An eye on your system glances \- An eye on your system
.SH SYNOPSIS .SH SYNOPSIS

2
glances/__init__.py
View File

@ -19,7 +19,7 @@ import tracemalloc
# Global name # Global name
# Version should start and end with a numerical char # Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version # See https://packaging.python.org/specifications/core-metadata/#version
__version__ = "4.3.1_dev03" __version__ = "4.3.1_dev06"
__apiversion__ = '4' __apiversion__ = '4'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3' __license__ = 'LGPLv3'

4
glances/outputs/static/css/style.scss
View File

@ -283,6 +283,10 @@ body {
* > td:nth-child(2), td:nth-child(3) { * > td:nth-child(2), td:nth-child(3) {
width: 15em; width: 15em;
} }
* > td:nth-child(3) {
white-space: nowrap;
overflow: hidden;
}
* > td:nth-child(4) { * > td:nth-child(4) {
width: 6em; width: 6em;
} }

2
glances/outputs/static/js/App.vue
View File

@ -12,7 +12,7 @@
<div class="col d-none d-xl-block d-xxl-block" v-if="!args.disable_ip"> <div class="col d-none d-xl-block d-xxl-block" v-if="!args.disable_ip">
<glances-plugin-ip :data="data"></glances-plugin-ip> <glances-plugin-ip :data="data"></glances-plugin-ip>
</div> </div>
<div class="col-auto ms-auto d-none d-xxl-block" v-if="!args.disable_now"> <div class="col-auto ms-auto d-none d-lg-block d-xl-block d-xxl-block" v-if="!args.disable_now">
<glances-plugin-now :data="data"></glances-plugin-now> <glances-plugin-now :data="data"></glances-plugin-now>
</div> </div>
<div class="col-auto ms-auto" v-if="!args.disable_uptime"> <div class="col-auto ms-auto" v-if="!args.disable_uptime">

2
glances/outputs/static/public/browser.js vendored
View File

File diff suppressed because one or more lines are too long

4
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long

2
snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: glances name: glances
version: '4.3.0.4+build02' # Put the current stable version+buildXX version: '4.3.0.5+build01' # Put the current stable version+buildXX
summary: Glances an Eye on your system. A top/htop alternative. summary: Glances an Eye on your system. A top/htop alternative.
description: | description: |