Skip to content

libcdoc #1329

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.

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

Open
wants to merge 152 commits into
base: master
Choose a base branch
from
Open

libcdoc #1329

wants to merge 152 commits into from

Conversation

lauris71
Copy link

Ported encrypted container handling to libcdoc

Signed-off-by: Lauris Kaplinski [email protected]

Lauris Kaplinski and others added 30 commits April 10, 2024 00:31
Signed-off-by: Lauris Kaplinski <[email protected]>
Signed-off-by: Lauris Kaplinski <[email protected]> (+1 squashed commit)
Squashed commits:
[907bf68] Fixes and cleanups for LT crypto

Signed-off-by: Lauris Kaplinski <[email protected]>
# Conflicts:
#	client/CDoc2.cpp
#	client/CryptoDoc.h
#	client/MainWindow.cpp
#	client/MainWindow.h
#	client/dialogs/PasswordDialog.cpp
#	client/dialogs/PasswordDialog.h
#	client/dialogs/PasswordDialog.ui
#	client/widgets/ContainerPage.cpp
# Conflicts:
#	client/widgets/AddressItem.cpp
Fixed whitespace

Co-authored-by: Raul Metsma <[email protected]>
Co-authored-by: Raul Metsma <[email protected]>
Co-authored-by: Raul Metsma <[email protected]>
…bcdoc

# Conflicts:
#	schema/header.fbs
#	schema/recipients.fbs
Lauris Kaplinski added 10 commits March 19, 2025 08:50
Signed-off-by: Lauris Kaplinski <[email protected]>
Signed-off-by: Lauris Kaplinski <[email protected]>
# Conflicts:
#	client/CryptoDoc.cpp
#	client/MainWindow.cpp
#	client/MainWindow.h
#	client/dialogs/AddRecipients.cpp
#	client/dialogs/AddRecipients.h
#	client/dialogs/KeyDialog.cpp
#	client/widgets/AddressItem.cpp
#	client/widgets/AddressItem.h
#	client/widgets/AddressItem.ui
#	client/widgets/ContainerPage.cpp
#	client/widgets/ContainerPage.h
#	client/widgets/ContainerPage.ui
#	client/widgets/MainAction.cpp
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.

2 participants