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

Group Chat #26

Merged
merged 29 commits into from
Jan 13, 2024
Merged

Group Chat #26

merged 29 commits into from
Jan 13, 2024

Conversation

tbraun96
Copy link
Contributor

@tbraun96 tbraun96 commented Oct 8, 2023

No description provided.

Tjemmmic and others added 26 commits September 5, 2023 23:40
@Tjemmmic
Starting Group Functions
04acfc0
@Tjemmmic
Group functions WIP
53c8a80
@Tjemmmic
Group functions cleanup
9e92d90
@Tjemmmic
Group Broadcast handling WIP
628a6fe
cleanup
3c6213a
@Tjemmmic
Commit to merge
c191728
@Tjemmmic
Merge remote-tracking branch 'origin/group_chat' into group_chat
a10c93c 
# Conflicts:
#	citadel_workspace_service/src/kernel/mod.rs
#	citadel_workspace_service/src/kernel/request_handler.rs
@Tjemmmic
Group fixes
318ae2e
@Tjemmmic
Group more fixes and cleanup
6b72b4b
@Tjemmmic
spawn_services refactor
91489c1
@Tjemmmic
test common refactor
9f4b360
@Tjemmmic
Finished Test Refactor
2fe1537
@Tjemmmic
Create group test file
98ecdbf
@Tjemmmic
SessionSecuritySettings Fix
4bf2e03
@Tjemmmic
Group Creation Test Working
be23227
resolve conflicts
2e4ce90
clippy lints
a8af842
@Tjemmmic
Group Invite Decline Fix
c8eb89a
@Tjemmmic
Merge remote-tracking branch 'origin/group_chat' into group_chat
ffff1ed
@Tjemmmic
Request Join WIP
59c65f4
@Tjemmmic
Group Broadcast Handling and Tests WIP
4da47d5
@Tjemmmic
Group Tests - Invite, Join, Leave, and End
98debd5
@Tjemmmic
Group Kick Test
3958f81
@Tjemmmic
Finalizing Group Tests
8f4947a
@Tjemmmic
Group Tests Workflow Fix
ed17a91
@Tjemmmic
Group Kick response fix
f8505d3
tbraun96
tbraun96 commented Dec 18, 2023
View reviewed changes
citadel_workspace_service/src/kernel/mod.rs Show resolved Hide resolved
citadel_workspace_service/src/kernel/mod.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/mod.rs Show resolved Hide resolved
citadel_workspace_service/src/kernel/mod.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/mod.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/tests/common/mod.rs Outdated Show resolved Hide resolved
citadel_workspace_service/tests/group_chat.rs Outdated Show resolved Hide resolved
citadel_workspace_service/tests/group_chat.rs Outdated Show resolved Hide resolved
citadel_workspace_types/src/lib.rs Outdated Show resolved Hide resolved
tbraun96
tbraun96 commented Dec 21, 2023
View reviewed changes
Copy link
Contributor Author

@tbraun96 tbraun96 left a comment

Choose a reason for hiding this comment

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

Almost there, just a few changes remaining. Looks good overall. We will merge this in after we merge in the dependency PR in the protocol.

citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Outdated Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Show resolved Hide resolved
citadel_workspace_service/src/kernel/request_handler.rs Show resolved Hide resolved
citadel_workspace_service/tests/common/mod.rs Outdated Show resolved Hide resolved
tbraun96
tbraun96 commented Dec 22, 2023
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@tbraun96 tbraun96 merged commit 0ed1285 into master Jan 13, 2024
6 checks passed
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.
2 participants
@tbraun96 @Tjemmmic