Commit Graph

234 Commits

Author SHA1 Message Date
Chris Cameron
ffeb313456 Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-08-21 12:06:14 -04:00
Chris Cameron
aeba163a0f chore: Updating changelog, incrementing patch version 2020-08-21 12:04:48 -04:00
Chris Cameron
49a154ebed fix: Removed the OnItemTrimmed event from the ScrollQueue due to deadlocks 2020-08-21 12:04:35 -04:00
Chris Cameron
3316ef9343 Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7 2020-08-17 10:16:58 -04:00
Chris Cameron
5ca76f7e7e Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6 2020-08-17 10:16:05 -04:00
Chris Cameron
66b8107233 Merge remote-tracking branch 'origin/ConnectPro_v1.4' into ConnectPro_v1.5 2020-08-17 10:15:39 -04:00
Chris Cameron
dd6dfa191e Merge remote-tracking branch 'origin/ConnectPro_v1.3' into ConnectPro_v1.4 2020-08-17 10:15:06 -04:00
Chris Cameron
5aa8b15472 Merge remote-tracking branch 'origin/ConnectPro_v1.2' into ConnectPro_v1.3
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-08-17 10:12:13 -04:00
Chris Cameron
c6cfdd4d72 chore: Updating changelog, incrementing patch version 2020-08-17 10:09:58 -04:00
Chris Cameron
ab699406a6 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2
# Conflicts:
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-08-17 10:08:10 -04:00
Chris Cameron
15330d7dd0 chore: Updating changelog, incrementing patch version 2020-08-17 10:03:30 -04:00
Chris Cameron
34cfe8c7a3 fix: Workaround for logged XML format exceptions when failing to parse floats 2020-08-17 10:01:58 -04:00
Drew Tingen
6d93911766 chore:changelog 2020-08-13 22:44:44 -04:00
Chris Cameron
a9f1c57d1e Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7 2020-07-29 10:21:55 -04:00
Chris Cameron
27bb1e3482 Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6 2020-07-29 10:17:41 -04:00
Chris Cameron
6173be0a1d Merge remote-tracking branch 'origin/ConnectPro_v1.4' into ConnectPro_v1.5 2020-07-29 10:17:03 -04:00
Chris Cameron
66502d3617 Merge remote-tracking branch 'origin/ConnectPro_v1.3' into ConnectPro_v1.4 2020-07-29 10:16:24 -04:00
Chris Cameron
0db03f7fdf Merge remote-tracking branch 'origin/ConnectPro_v1.2' into ConnectPro_v1.3
# Conflicts:
#	CHANGELOG.md
2020-07-29 10:15:58 -04:00
Chris Cameron
a74cdc5614 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-07-29 10:14:02 -04:00
Drew Tingen
7f306801b3 chore: Updating changelog, incremeting patch version 2020-07-29 10:01:43 -04:00
Austin Noska
51ec3dd8ff docs: Update changelog 2020-07-28 18:09:00 -04:00
Chris Cameron
5d9369b582 chore: Updating changelog, incrementing minor version 2020-07-14 13:21:37 -04:00
Drew Tingen
0a87c4efe7 chore: update changelog 2020-07-07 21:31:34 -04:00
Drew Tingen
80b1412632 chore: changelog 2020-07-07 21:31:32 -04:00
Austin Noska
ee670487dd feat: Added AggregateOrDefault extension method 2020-06-29 11:51:46 -04:00
Chris Cameron
4f34b3da7c feat: Added attributes for controlling obfuscation 2020-06-26 14:06:58 -04:00
Chris Cameron
9bf0a9b8a5 chore: Updating changelog, incrementing major version 2020-06-18 13:57:39 -04:00
Chris Cameron
6240d3fccf Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7 2020-05-27 16:04:13 -04:00
Chris Cameron
88ff67b356 Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6 2020-05-27 16:02:50 -04:00
Chris Cameron
1d0ba453e3 Merge branch 'ConnectPro_v1.4' into ConnectPro_v1.5 2020-05-27 15:59:53 -04:00
Chris Cameron
121d267aad Merge branch 'ConnectPro_v1.3' into ConnectPro_v1.4 2020-05-27 15:59:40 -04:00
Chris Cameron
f23b051c3a Merge branch 'ConnectPro_v1.2' into ConnectPro_v1.3 2020-05-27 15:59:27 -04:00
Chris Cameron
b5ec51d9a4 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-05-27 15:59:12 -04:00
Chris Cameron
62f54f1213 chore: Updating changelog, incrementing patch version 2020-05-27 15:56:22 -04:00
Drew Tingen
dd3c0f530b chore: Changelog 2020-05-27 11:28:12 -04:00
Chris Cameron
1a027bcea0 chore: Updating changelog 2020-05-26 10:25:22 -04:00
Chris Cameron
00803fcd66 Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7
# Conflicts:
#	CHANGELOG.md
2020-05-19 10:50:55 -04:00
Chris Cameron
9912097a33 chore: Updating changelog, incrementing minor version 2020-05-19 10:48:55 -04:00
Drew Tingen
cad3cf60cf chore: changelog 2020-05-18 15:27:51 -04:00
Drew Tingen
2ad9adf86c feat: ScrollQueue - added OnItemTrimmed event 2020-05-07 18:16:54 -04:00
Chris Cameron
dd3c6b13fd Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7 2020-05-01 13:30:26 -04:00
Chris Cameron
f9dccd30e5 Merge remote-tracking branch 'origin/ConnectPro_v1.5' into ConnectPro_v1.6 2020-04-30 21:49:38 -04:00
Chris Cameron
db0029bbc1 Merge remote-tracking branch 'origin/ConnectPro_v1.4' into ConnectPro_v1.5 2020-04-30 21:29:50 -04:00
Chris Cameron
a5289e01f7 Merge remote-tracking branch 'origin/ConnectPro_v1.3' into ConnectPro_v1.4 2020-04-30 19:38:47 -04:00
Chris Cameron
9de5acfbe7 Merge remote-tracking branch 'origin/ConnectPro_v1.2' into ConnectPro_v1.3
# Conflicts:
#	ICD.Common.Utils/ProgramUtils.SimplSharp.cs
2020-04-30 18:49:14 -04:00
Chris Cameron
a22c3626ab Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
2020-04-30 15:16:23 -04:00
Chris Cameron
d90c60126e chore: Updating changelog, incrementing minor version 2020-04-30 13:02:14 -04:00
Chris Cameron
96946d6323 refactor: Rewrote JsonItemWrapper serialization for JsonConvert friendliness 2020-04-09 12:21:42 -04:00
Chris Cameron
5978d492cf feat: Added eIcdFileMode for IO platform agnosticism 2020-03-27 13:54:29 -04:00
Chris Cameron
a1775b281f feat: TableBuilder supports multi-line content 2020-03-26 14:16:40 -04:00