Skip to content

katta-server aka. downstream diff to upstream#52

Open
chenkins wants to merge 953 commits intofeature/uvffrom
feature/cipherduck-uvf
Open

katta-server aka. downstream diff to upstream#52
chenkins wants to merge 953 commits intofeature/uvffrom
feature/cipherduck-uvf

Conversation

@chenkins
Copy link
Copy Markdown
Collaborator

@chenkins chenkins commented Jun 7, 2024

@chenkins chenkins changed the base branch from feature/uvf to develop June 7, 2024 12:42
@chenkins chenkins changed the base branch from develop to feature/uvf June 7, 2024 12:42
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch from 59b3d04 to 9856452 Compare June 7, 2024 12:49
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch from 9856452 to e74c9eb Compare August 20, 2024 12:35
@chenkins chenkins changed the base branch from feature/uvf to develop October 10, 2024 08:09
@chenkins chenkins changed the base branch from develop to feature/uvf October 10, 2024 08:10
@chenkins chenkins mentioned this pull request Oct 10, 2024
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch 3 times, most recently from fa8c169 to 045912a Compare November 7, 2024 10:02
[![CI Build](https://github.com/shift7-ch/katta-server/actions/workflows/build.yml/badge.svg)](https://github.com/shift7-ch/katta-server/actions/workflows/build.yml)

# Cryptomator Hub
# Katta: the secure and easy way to work in teams
Copy link
Copy Markdown
Collaborator Author

@chenkins chenkins Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tobihagemann @overheadhunter to close to https://cryptomator.org/hub/? How to bring in with few words the part that katta adds to cryptomator hub eco-system, namely sync client and storage management. Should the use of uvf (open standard) be top-level?

# Katta: the secure and easy way to work in teams

Hub consists of these components:
Katta bring zero-config storage management and zero-knowledge key management for teams and organizations.
Copy link
Copy Markdown
Collaborator Author

@chenkins chenkins Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tobihagemann @overheadhunter dito - any suggestions?

Comment on lines +8 to +9
"arn:aws:iam::930717317329:oidc-provider/login1.staging.cryptomator.cloud/realms/cipherduck",
"arn:aws:iam::930717317329:oidc-provider/testing.hub.cryptomator.org/kc/realms/cipherduck"
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove/finalize

Comment on lines +8 to +9
"arn:aws:iam::930717317329:oidc-provider/testing.hub.cryptomator.org/kc/realms/cipherduck",
"arn:aws:iam::930717317329:oidc-provider/login1.staging.cryptomator.cloud/realms/cipherduck"
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove/finalize

@@ -45,12 +45,190 @@
"client": {
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SailReal meint:

bleiben die cryptomator hub's hier drin

@chenkins chenkins changed the base branch from feature/uvf to develop May 1, 2025 07:44
@chenkins chenkins changed the base branch from develop to feature/uvf May 1, 2025 07:44
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch 3 times, most recently from 863be7a to 3457791 Compare May 6, 2025 20:11
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch 2 times, most recently from 71836dd to 6e473d0 Compare May 13, 2025 12:33
@chenkins chenkins changed the title Feature/cipherduck uvf katta-server downstream May 20, 2025
@chenkins chenkins changed the title katta-server downstream katta-server aka. downstream May 20, 2025
@chenkins chenkins force-pushed the feature/cipherduck-uvf branch from 87556a9 to ebd7395 Compare May 20, 2025 18:13
tobihagemann and others added 30 commits March 27, 2026 10:18
Allow admins to archive and unarchive any vault
…e.java

Co-authored-by: Julian Raufelder <Julian@Raufelder.com>
`user` role is only omitted in view
Add legacy device deprecation banner for users and admins
* New translations
* Validate missing selected storage profile.

* Validate missing selected region.

* Do not show form if no storage profiles available.

* Extract localization.

* Fix styling, typo, and bug in vault creation validation.

---------

Co-authored-by: Tobias Hagemann <tobias.hagemann@shift7.ch>
* New translations
# Conflicts:
#	frontend/src/common/backend.ts
#	frontend/src/components/ArchiveVaultDialog.vue
#	frontend/src/components/CreateVault.vue
#	frontend/src/components/ReactivateVaultDialog.vue
#	frontend/src/components/VaultDetails.vue
#	frontend/src/components/emergencyaccess/EmergencyAccessDialog.vue
#	frontend/src/components/emergencyaccess/GrantEmergencyAccessDialog.vue
…/126-update-user-creation-from-upstream

# Conflicts:
#	backend/src/main/resources/application.properties
#	frontend/src/common/backend.ts
#	frontend/src/components/ArchiveVaultDialog.vue
#	frontend/src/components/CreateVault.vue
#	frontend/src/components/ReactivateVaultDialog.vue
#	keycloak/Dockerfile
…on-from-upstream

Update user creation from upstream.
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.

10 participants