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.

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

Team settings #245

Merged
merged 78 commits into from
Jul 14, 2024
Merged

Team settings #245

merged 78 commits into from
Jul 14, 2024

Conversation

araszka
Copy link
Member

@araszka araszka commented Jul 6, 2024

No description provided.

araszka added 16 commits June 8, 2024 15:55
…ms' into team-settings

# Conflicts:
#	EvoSC.sln
#	src/EvoSC.Common/Interfaces/IServerClient.cs
#	src/EvoSC.Common/Interfaces/Models/IParsedMap.cs
#	src/EvoSC.Common/Interfaces/Services/IMapService.cs
#	src/EvoSC.Common/Interfaces/Themes/DefaultThemeOptions.cs
#	src/EvoSC.Common/Themes/BaseEvoScTheme.cs
#	src/EvoSC.Manialinks/EvoSC.Manialinks.csproj
#	src/EvoSC.Manialinks/ManialinkManager.cs
#	src/EvoSC.Manialinks/Templates/Containers/Container.mt
#	src/EvoSC.Manialinks/Templates/Containers/Window.mt
#	src/EvoSC.Manialinks/Templates/Controls/Button.mt
#	src/EvoSC.Manialinks/Templates/Controls/Switch.mt
#	src/EvoSC.Manialinks/Templates/Controls/Text.mt
#	src/EvoSC.Manialinks/Templates/Controls/TextInput.mt
#	src/EvoSC.Manialinks/Templates/Drawing/Circle.mt
#	src/EvoSC.Manialinks/Templates/Drawing/QuarterCircle.mt
#	src/EvoSC.Manialinks/Templates/Drawing/Rectangle.mt
#	src/EvoSC.Manialinks/Templates/Scripts/Button.ms
#	src/EvoSC.Manialinks/Templates/Scripts/Chip.ms
#	src/EvoSC.Manialinks/Templates/Scripts/Switch.ms
#	src/EvoSC.Manialinks/Templates/Style/UIStyle.mt
#	src/EvoSC.Manialinks/Themes/DefaultSelectTheme.cs
#	src/EvoSC.Manialinks/Util/GlobalManialinkUtils.cs
#	src/EvoSC/InternalModules.cs
#	src/Modules/ExampleModule/Templates/UIDemo.mt
#	src/Modules/MapListModule/Controllers/MapListCommandController.cs
#	src/Modules/MapListModule/Controllers/MapListManialinkController.cs
#	src/Modules/MapListModule/Database/Models/DbMapTag.cs
#	src/Modules/MapListModule/Interfaces/IMapListService.cs
#	src/Modules/MapListModule/Interfaces/Models/IMapFavorite.cs
#	src/Modules/MapListModule/Interfaces/Models/IMapListMap.cs
#	src/Modules/MapListModule/Interfaces/Models/IMapTag.cs
#	src/Modules/MapListModule/MapListModule.csproj
#	src/Modules/MapListModule/Services/MapListService.cs
#	src/Modules/MapListModule/Templates/MapList.mt
#	src/Modules/MapListModule/Templates/Parts/MapRow.mt
#	src/Modules/MapListModule/info.toml
#	src/Modules/MapQueueModule/Controllers/QueueCommandsController.cs
#	src/Modules/MapQueueModule/Controllers/QueueController.cs
#	src/Modules/MapQueueModule/Events/Args/MapQueueEventArgs.cs
#	src/Modules/MapQueueModule/Events/Args/MapQueueMapDroppedEventArgs.cs
#	src/Modules/MapQueueModule/Events/MapQueueEvents.cs
#	src/Modules/MapQueueModule/Interfaces/IMapQueueService.cs
#	src/Modules/MapQueueModule/Interfaces/Utils/AsyncDeque/IAsyncDeque.cs
#	src/Modules/MapQueueModule/Interfaces/Utils/AsyncDeque/IDequeNode.cs
#	src/Modules/MapQueueModule/Services/MapQueueService.cs
#	src/Modules/MapQueueModule/Utils/AsyncDeque/AsyncDeque.cs
#	tests/EvoSC.Common.Tests/Services/MapServiceTests.cs
#	tests/Modules/MapQueueModuleTests/MapQueueModuleTests.csproj
#	tests/Modules/MapQueueModuleTests/Utils/AsyncDequeMapObjectTests.cs
#	tests/Modules/MapQueueModuleTests/Utils/AsyncDequeTests.cs
@snixtho
Copy link
Member

snixtho commented Jul 7, 2024

resolve the conflicts and add tests

Copy link
Member

@snixtho snixtho left a comment

Choose a reason for hiding this comment

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

src/Modules/TeamSettingsModule/info.toml Outdated Show resolved Hide resolved
Copy link

sonarcloud bot commented Jul 13, 2024

@araszka araszka merged commit fd29f91 into master Jul 14, 2024
2 checks passed
@araszka araszka deleted the team-settings branch July 14, 2024 14:04
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