Skip to content

Develop -> Main for v3.1.5#132

Merged
fvalle1 merged 120 commits intomainfrom
develop
Feb 13, 2026
Merged

Develop -> Main for v3.1.5#132
fvalle1 merged 120 commits intomainfrom
develop

Conversation

@C4lopsitta
Copy link
Contributor

No description provided.

C4lopsitta and others added 26 commits January 22, 2026 17:27
# Conflicts:
#	electros-electron/package.json
- Added file/folder shell opener

(cherry picked from commit 0705374)
- Added keychain encryption

(cherry picked from commit ff02ef3)
(cherry picked from commit 03b931a)
(cherry picked from commit 7cd8d79)
- Rendering of fonts has been fixed
- Colours have been added
Added two shell scripts to tail the logs and stream them over a chunked connection. Added `socat` package inside container to log
@C4lopsitta C4lopsitta requested a review from fvalle1 February 13, 2026 15:24
# Conflicts:
#	docker/Dockerfile
#	docker/arm_Dockerfile
#	docker/arm_startup.sh
#	docker/nginx.conf
#	docker/startup.sh
#	electros-electron/common/Daemons.js
#	electros-electron/main.js
#	electros-electron/package.json
#	electros-electron/preload.js
#	electros-electron/terminal/terminal.html
#	elemento-gui-new
@C4lopsitta C4lopsitta marked this pull request as ready for review February 13, 2026 15:29
@fvalle1 fvalle1 merged commit 43c57ea into main Feb 13, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants