icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 20:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
972 Commits 2 Branches 72 Tags
0db03f7fdf1ac6a59b9aa5153fd577df6e2554cf
Commit Graph

139 Commits

Author SHA1 Message Date
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
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
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
d051ddb098 Merge branch 'ConnectPro_v1.2' into ConnectPro_v1.3 
# Conflicts:
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2020-02-18 12:59:56 -05:00
Chris Cameron
a53ad74811 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2020-02-18 12:59:18 -05:00
Chris Cameron
69eb4b3d34 chore: Updating changelog, incrementing patch version 2020-02-18 12:13:00 -05:00
Drew Tingen
8e5486e1ef chore: Changelog 2020-02-14 23:56:56 -05:00
Chris Cameron
c60acf52ba Merge remote-tracking branch 'origin/ConnectPro_v1.2' into ConnectPro_v1.3 2020-02-03 16:27:54 -05:00
Chris Cameron
311bf683e0 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Extensions/DictionaryExtensions.cs
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2020-02-03 16:12:26 -05:00
Chris Cameron
d025946948 chore: Updating changelog, incrementing minor version 2020-01-23 12:46:06 -05:00
Chris Cameron
ab2fab0b3a Merge remote-tracking branch 'origin/ConnectPro_v1.2' into ConnectPro_v1.3 2019-10-29 14:58:19 -04:00
Chris Cameron
9b69b2a712 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-10-29 14:57:38 -04:00
Chris Cameron
0a1f637b45 chore: Updating changelog, incrementing patch version 2019-10-29 14:52:36 -04:00
Jack Kanarish
9f1541f843 chore: update changelog 2019-10-29 14:19:58 -04:00
Chris Cameron
71bb320057 chore: Updating changelog, incrementing minor version 2019-09-03 10:52:19 -04:00
Austin Noska
9c07b3da04 docs: updating changelog 2019-08-30 17:21:17 -04:00
Chris Cameron
18abe78550 feat: Better handling of JSON DateTimes in Net Standard 2019-08-27 15:01:09 -04:00
Chris Cameron
4938dad882 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.4 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-08-22 10:42:57 -04:00
Chris Cameron
5900f5974b chore: Updating changelog, incrementing patch version 2019-08-22 10:41:00 -04:00
Chris Cameron
440c1c62f1 fix: Fixed a bug with the IcdOrderedDict index setter that was creating additional values 2019-08-22 10:17:32 -04:00
Chris Cameron
f8c88630fc fix: Fixed a bug where ANSI color encoded strings with percentages were being scrambled 2019-08-20 15:34:40 -04:00
Chris Cameron
3f1f9611ec chore: Updating changelog, incrementing minor version 2019-08-15 11:02:18 -04:00
Laura Gomez
7b44867f34 docs: updating changelog 2019-07-30 13:38:37 -04:00
Austin Noska
cb3677bd72 docs: updating changelog 2019-07-11 10:39:26 -04:00
Chris Cameron
1a868d5a7d chore: Updating changelog, incrementing minor version 2019-07-03 10:22:01 -04:00
Austin Noska
00e7fd6a6b docs: updating changelog 2019-06-27 11:00:03 -04:00
Chris Cameron
8c160c77c4 docs: Updating changelog 2019-06-26 13:33:37 -04:00
Chris Cameron
3a2fc0eef7 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.3 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-06-24 12:52:24 -04:00
Chris Cameron
1be852685d chore: Updating changelog, incrementing minor version 2019-06-24 12:49:39 -04:00
Chris Cameron
e8acb42bb9 fix: Fixed bug in IcdUriBuilder where Query property behaved differently to UriBuilder 2019-06-21 21:32:46 -04:00
Chris Cameron
d3d812265e Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.3 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-06-14 16:54:12 -04:00
Chris Cameron
b915401109 chore: Updating changelog, incrementing patch version 2019-06-14 16:52:56 -04:00
Chris Cameron
b680bab67a Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-06-14 10:28:13 -04:00
Chris Cameron
7666021925 chore: Updating changelog, incrementing minor version 2019-06-14 10:25:47 -04:00
Chris Cameron
0152259a25 chore: Updating changelog, incrementing minor version 2019-06-10 13:50:37 -04:00
Chris Cameron
98c3f17602 docs: Updating changelog 2019-06-10 13:50:23 -04:00
Chris Cameron
43d7ea944e Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-06-06 15:54:04 -04:00
Chris Cameron
6526b2b811 chore: Updating changelog, incrementing minor version 2019-06-06 15:52:35 -04:00
Chris Cameron
ead365e251 chore: Fixing bad merge 2019-06-06 15:51:53 -04:00
Jack Kanarish
f24e6d2597 Merge branch 'feat/init-event' into MetLife_v5.4.2 
# Conflicts:
#	CHANGELOG.md
 2019-06-06 11:06:09 -04:00
Chris Cameron
311f2dfaf4 Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.2 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
 2019-06-05 15:03:33 -04:00
Chris Cameron
02c18d152f chore: Updating changelog, incrementing patch version 2019-06-05 14:34:59 -04:00