DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: DarthAffe:1e8c68bbeb5650d0ce7ce20344bafd42ac2d93a5
Branches Tags
DarthAffe:master
DarthAffe:development
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease
...
compare: DarthAffe:a6e75d7a40dc12cbcc9e61fdc2b3ffbc88820d87
Branches Tags
DarthAffe:master
DarthAffe:development
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease

26 Commits
1e8c68bbeb ... a6e75d7a40

Author SHA1 Message Date
RobertBeekman
a6e75d7a40
Merge pull request #854 from Artemis-RGB/JsonUpdate 
Bumped System-Text.Json to 8.0.4
 2024-08-17 14:10:42 +02:00
Darth Affe
bedf1f5f38 Bumped System-Text.Json to 8.0.4 2024-08-10 22:49:45 +02:00
Robert
972f1c638c Merge branch 'development' 2024-07-22 14:52:36 +02:00
Robert
4debfee6c1 Merge branch 'development' 2024-07-22 14:42:24 +02:00
Robert
a793a08213 Merge branch 'development' 2024-07-22 11:02:05 +02:00
Robert
0e911d68ba Merge branch 'development' 2024-07-12 23:42:49 +02:00
Robert
bd904178c8 Merge branch 'development' 2024-07-04 20:16:21 +02:00
Robert
7052ee38b6 Merge branch 'development' 2024-05-18 13:32:53 +02:00
Robert
d9a3a238af Merge branch 'development' 2024-05-03 21:08:48 +02:00
Robert
058513fd2a Merge branch 'development' 2024-04-14 16:00:08 +02:00
RobertBeekman
e5cb058152 Merge branch 'development' 2024-03-21 20:15:58 +01:00
Robert
4c2eca29cc Storage - Fix profile order not loading/saving 2024-03-15 23:41:00 +01:00
Robert
8d7af6bb85 Merge branch 'development' 2024-03-15 17:13:27 +01:00
Robert
91d1d16f24 Merge branch 'development' 2024-03-14 20:44:51 +01:00
Robert
e588a06516 Merge branch 'development' 2024-03-14 20:08:17 +01:00
Robert
8c1fef2883 Merge branch 'development' 2024-03-14 07:25:41 +01:00
Robert
1201820799 Merge branch 'development' 2024-03-14 07:12:21 +01:00
Robert
59c9538e65 Merge branch 'development' 2024-03-13 20:19:53 +01:00
RobertBeekman
9fcd20d762 Merge branch 'development' 2024-03-03 22:09:53 +01:00
RobertBeekman
554f3e1ac7 Merge branch 'development' 2024-03-02 12:20:00 +01:00
Robert
13c4820738 Merge branch 'development' 2024-03-01 22:35:34 +01:00
Robert
1d23c69d39 Merge branch 'development' 2024-02-28 23:27:41 +01:00
RobertBeekman
e6565a2896 Merge branch 'development' 2024-02-28 20:03:29 +01:00
Diogo Trindade
39c0b6c51b
Merge branch 'development' 2024-02-25 19:12:54 +00:00
RobertBeekman
be92701c67 Merge branch 'development' 2024-02-25 15:32:33 +01:00
RobertBeekman
6956f09bb6 Merge branch 'development' 2024-02-25 11:45:47 +01:00
2 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

5
src/Artemis.Core/Models/Profile/ProfileCategory.cs
View File

@ -167,7 +167,7 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
IsSuspended = Entity.IsSuspended;
Order = Entity.Order;
ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).ToList());
ProfileConfigurations = new ReadOnlyCollection<ProfileConfiguration>(Entity.ProfileConfigurations.Select(pc => new ProfileConfiguration(this, pc)).OrderBy(pc => pc.Order).ToList());
}
/// <inheritdoc />
@ -180,7 +180,10 @@ public class ProfileCategory : CorePropertyChanged, IStorageModel
Entity.ProfileConfigurations.Clear();
foreach (ProfileConfiguration profileConfiguration in ProfileConfigurations)
{
profileConfiguration.Save();
Entity.ProfileConfigurations.Add(profileConfiguration.Entity);
}
}
#endregion

2
src/Directory.Packages.props
View File

@ -59,7 +59,7 @@
<PackageVersion Include="Splat.DryIoc" Version="15.1.1" />
<PackageVersion Include="StrawberryShake.Server" Version="13.9.6" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.2" />
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="TextMateSharp.Grammars" Version="1.0.57" />
</ItemGroup>
</Project>