Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version switch #44

Merged
merged 110 commits into from
Oct 14, 2024
Merged

Version switch #44

merged 110 commits into from
Oct 14, 2024

Conversation

Ndaboom
Copy link
Owner

@Ndaboom Ndaboom commented Oct 14, 2024

  • This MR introduces the latest changes from the upstream and fixes conflicts, except for the file default.handlebars.
  • The bootstrap UI is in views/default3.handlebars

wow0000 and others added 30 commits August 2, 2024 11:48
@wow0000
add support for PXE reboot/power (Ylianst#6298)
999ae7f
@si458
update translate.json
41e4213 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@HuFlungDu
Changed database file encryption to pbkdf2 for key derivation and aes…
5b76a31 
…-256-gcm for encryption (Ylianst#6296)

* Added pbkdf2 and aes-256-gcm options for database file encryption

* Added dbCipherAlgorithm option

* Changed pbkdf2 to default

Maintains backward compatibility, but will require a manual repush to update to the new version

* Removed dbkeyderivationiterations option, as this branch is to be more opinionated
@Ylianst
Improved configuration file encryption in the database, added testing.
fc29e60
@Ylianst
Fixed typo.
a6acb35
@si458
fix agentidletimeout being undefined
6f2b579 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
add intel amt identifier to ui to help find passwords in amtpasswords
fbd4533 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@GraphicHealer
Update apprelays.js to fix Header issue (Ylianst#6306)
698b7fb 
Add `.trim()` to the header label value (`i`) to fix a rare circumstance where there can be a space in the header name.
@si458
show seperate macos mpkgs in web ui Ylianst#6308
0887784 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
update mpkg with arm64 support
61f1c22 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
@si458
dont allow deleting yourself in my users tab in web ui
899ff0c 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
add png and tiff to encoding in web ui Ylianst#6315
3efa680 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix local amt with sqlite/mysql/postgres Ylianst#6321
77f44fc 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
@si458
getLocalAmtNodes only show intelamt devices fix Ylianst#6321
adeaac1 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
@wow0000
AMT: Fix One Click Recovery support (Ylianst#6301)
92385e3 
* add support for PXE reboot/power

* AMT: Fix support for OneClickRecovery
@si458
use hardware identifier if no intelamt uuid
3a28e33 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
autobackup improvements Ylianst#6324
aae551d 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix mysql autoback zippassword
c1e3354 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
@si458
fix meshctrl with key=xxx and loginkey Ylianst#6328
fa39f8a 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix meshcmd os select Ylianst#6327
cee181f 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix file edit box missing data Ylianst#5813
7caf2aa 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@Ylianst
Spanish update.
2f61e3e
@si458
add Ukrainian translation Ylianst#6335
8dd5545 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
@si458
add ukrainian agent-translations
3a78cb8 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
dont minify charts or OL JS files Ylianst#6338
0ccce62 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
dont do utf8 validation for mongodb Ylianst#6340
21e196e 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix disconnections of new user logins with ldap Ylianst#6240
d2d9f7a 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix remoteaddr null in consent disconnect Ylianst#6290
e1e5995 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
allow full keyboard control in fullscreen using chrome Ylianst#1881
f95dbdd 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
full keyboard control in fullscreen using chrome in sharing Ylianst#1881
bf00de4 


Signed-off-by: si458 <simonsmith5521@gmail.com>
Ylianst and others added 28 commits September 26, 2024 21:19
@Ylianst
Version 1.1.31
a3fd600
@Ylianst
Dependency fix
23679d1
@si458
Update package.json
9f8ea3a
@si458
update package-lock.json
3eede1b 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix agentTimeStampServer and agentTimeStampProxy not being set correc…
2beeb6f 
…tly Ylianst#6409

Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix DeskTools only dragging one way Ylianst#6257
5ff44bb 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix novnc missing desktopName from title Ylianst#6412
b20e515 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
update noVNC to 1.5.0
1139a37 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
allow password resets when using allowaccountreset and reset together Y…
8e5aa35 
…lianst#6261

Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
add debug/log to schema file
113adb5 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
Revert "allow password resets when using allowaccountreset and reset …
41d1f9d 
…together Ylianst#6261"

This reverts commit 8e5aa35.
@Ylianst
Version 1.1.32
4848df4
@si458
refix publicfiles sharing for folder based domains Ylianst#6406
952bcde 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix public folder sharing for domains without dns
3772926 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix login button disabled when autofilled Ylianst#6428
ec75059 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@HuFlungDu
Fixed bug with agent reconnecting (Ylianst#6431)
1d87c42
@si458
always show active users for offline devices Ylianst#6421
19d0df7 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix meshaction with foldr based domains Ylianst#6436
590166f 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
move orphanAgentUser to domain config-schema
d136879 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix log.txt with json objects
ea8e1b1 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
update express to fix xss
6dbc6d2 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
fix reports missing multiplex desktop sessions Ylianst#6445
5a0d305 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@si458
show local/relay devices in online filter Ylianst#6440
6d412a7 
Signed-off-by: si458 <simonsmith5521@gmail.com>
@Ndaboom
[ENH] default.handleabars: initialize different meshcentral version s…
932fb96 
…witch, from bootstrap to classic
@Ndaboom
[ENH] default.handlebars: rename bootstrap ui file to default3.handle…
bebf12a 
…bars
@Ndaboom
[MRG] upstream default.handlebars in origin default.handlebars
d611c0b
@Ndaboom
[REM] default.handlebars: remove classic ui file
9e3719c
@Ndaboom
[MRG] upstream into origin
e039e82
@Ndaboom Ndaboom merged commit 985429a into master Oct 14, 2024
@Ndaboom Ndaboom deleted the version-switch branch December 21, 2024 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Ndaboom @wow0000 @si458 @HuFlungDu @Ylianst @GraphicHealer @petervanv @silversword411 @dmikoss @wdlut