justmurphy
|
3ebcfeb9cd
|
Merge pull request #355 from smjreynolds/add-osirium
Add Osirium products (PAM, PEM, and PPA) to software list as not affected
|
2021-12-23 07:17:10 -05:00 |
|
justmurphy
|
3789815ab1
|
Merge branch 'develop' into add-osirium
|
2021-12-23 07:02:01 -05:00 |
|
justmurphy
|
ffcb929928
|
Merge branch 'develop' into c42
|
2021-12-23 06:58:35 -05:00 |
|
justmurphy
|
22bffa4905
|
Merge pull request #359 from francescor/develop
fix typos in Status column (it helps while importing data in DB so to filter by Status column)
|
2021-12-23 06:58:16 -05:00 |
|
Francesco R
|
3a8670e962
|
replacing "NotAffected" with "Not Affected"
it helps while importing this file in a Database, so to filter by Status column
|
2021-12-23 12:29:24 +01:00 |
|
Francesco R
|
5e1a422726
|
fix typos
|
2021-12-23 12:26:47 +01:00 |
|
Mike Shepperd
|
01d81da64c
|
adding Cod42,Concourse,Abnormal Security
|
2021-12-22 18:05:44 -06:00 |
|
justmurphy
|
a9e79b581e
|
Merge branch 'develop' into add-osirium
|
2021-12-22 18:01:29 -05:00 |
|
justmurphy
|
ebdf1fe5e3
|
Merge pull request #353 from inl-ics/develop
Update SOFTWARE-LIST.md
|
2021-12-22 18:01:00 -05:00 |
|
justmurphy
|
c15e4727ae
|
remove tm characters
|
2021-12-22 18:00:05 -05:00 |
|
Sam Reynolds
|
8335620668
|
Add Osirium products to software list
|
2021-12-22 22:55:36 +00:00 |
|
justmurphy
|
495c7f4b1c
|
Merge branch 'develop' into develop
|
2021-12-22 17:55:17 -05:00 |
|
justmurphy
|
6bd6eaebc6
|
Merge pull request #354 from cisagov/app-column
App column
|
2021-12-22 17:55:07 -05:00 |
|
justmurphy
|
61cf83f18a
|
Re-add entry
|
2021-12-22 17:53:06 -05:00 |
|
justmurphy
|
ae21402d02
|
Remove entry
|
2021-12-22 17:51:13 -05:00 |
|
inl-ics
|
2478d10e3a
|
Update SOFTWARE-LIST.md
Added Canon, GE Digital, GE Digital Grid, GE Healthcare, GE Gas Power, and STERIS
|
2021-12-22 15:50:33 -07:00 |
|
justmurphy
|
3843580000
|
Fix missing version column
|
2021-12-22 17:47:11 -05:00 |
|
justmurphy
|
6c3b36e842
|
Merge pull request #352 from cisagov/justmurphy-patch-1
Update SOFTWARE-LIST.md
|
2021-12-22 17:21:20 -05:00 |
|
justmurphy
|
2b52adf4f0
|
Update SOFTWARE-LIST.md
|
2021-12-22 17:20:28 -05:00 |
|
justmurphy
|
51574b30d9
|
Merge pull request #347 from AstrobioMike/develop
Update SOFTWARE-LIST.md
|
2021-12-22 17:12:09 -05:00 |
|
Nicholas McDonnell
|
5e8a7bd9a6
|
Make sure the template will get tested by linters
Change the template's extension to `.md` to ensure that it is checked
by the markdownlint hook (and any others).
|
2021-12-22 17:08:44 -05:00 |
|
justmurphy
|
33ba68d913
|
Merge branch 'develop' into develop
|
2021-12-22 17:08:03 -05:00 |
|
Lcerkov
|
ace73a33ca
|
Merge pull request #350 from PBXMonitor/patch-1
Update SOFTWARE-LIST.md
|
2021-12-22 17:04:45 -05:00 |
|
Lcerkov
|
6a4922e252
|
Merge branch 'develop' into patch-1
|
2021-12-22 17:04:00 -05:00 |
|
Lcerkov
|
cd055a61f9
|
Merge pull request #351 from cisagov/autodesk
update autodesk issue #270
|
2021-12-22 16:59:49 -05:00 |
|
Lcerkov
|
de8dc2b91b
|
update autodesk issue #270
|
2021-12-22 16:57:50 -05:00 |
|
justmurphy
|
4d68454bba
|
Merge branch 'develop' into develop
|
2021-12-22 16:29:36 -05:00 |
|
justmurphy
|
45688937f1
|
Merge pull request #348 from mrshorten/develop
Update SOFTWARE-LIST.md
|
2021-12-22 16:29:19 -05:00 |
|
justmurphy
|
f468d32ad7
|
Merge branch 'develop' into develop
|
2021-12-22 16:28:20 -05:00 |
|
justmurphy
|
e89f75f58c
|
Add AFHCAN website link
|
2021-12-22 16:27:41 -05:00 |
|
justmurphy
|
35676dd989
|
Remove extra pipe and trailing whitespace
|
2021-12-22 16:20:14 -05:00 |
|
mrshorten
|
b26e430abe
|
Merge branch 'develop' into develop
|
2021-12-22 12:15:30 -09:00 |
|
justmurphy
|
31bcc744ac
|
Merge pull request #349 from inl-ics/develop
Update SOFTWARE-LIST.md
|
2021-12-22 16:13:51 -05:00 |
|
justmurphy
|
8bed4d89ae
|
Add formatting fixes
|
2021-12-22 16:12:50 -05:00 |
|
PBXMonitor
|
76cfe863da
|
Update SOFTWARE-LIST.md
Added PBXMonitor to the list with information
|
2021-12-22 14:10:52 -07:00 |
|
inl-ics
|
57dc71af47
|
Update SOFTWARE-LIST.md
|
2021-12-22 13:34:15 -07:00 |
|
inl-ics
|
0fd2760ed5
|
Update SOFTWARE-LIST.md
|
2021-12-22 13:32:11 -07:00 |
|
inl-ics
|
b6faf2e7db
|
Update SOFTWARE-LIST.md
Added Arbiter Systems, AMD, Beijer Electronics, BioMerieux, Bosh, and Canary
|
2021-12-22 13:29:47 -07:00 |
|
mrshorten
|
8ad35201ab
|
Update SOFTWARE-LIST.md
Added AFHCAN Global LLC List of products. Lines 43-48
|
2021-12-22 11:26:56 -09:00 |
|
justmurphy
|
4c76e87b0f
|
Merge pull request #346 from simbaja-ey/develop
Azure/BvD Updates
|
2021-12-22 15:14:36 -05:00 |
|
justmurphy
|
5e2a561a8a
|
Remove BvD entry
|
2021-12-22 15:12:59 -05:00 |
|
Mike Lee
|
924eb00fd4
|
Update SOFTWARE-LIST.md
|
2021-12-22 12:08:53 -08:00 |
|
justmurphy
|
2bd2606214
|
Update Microsoft entry spacing (format-fix)
|
2021-12-22 15:07:31 -05:00 |
|
justmurphy
|
8c750fd27a
|
Merge branch 'develop' into develop
|
2021-12-22 15:05:26 -05:00 |
|
Jack C Simbach
|
565c16a098
|
- fixed duplicate
|
2021-12-22 14:59:14 -05:00 |
|
Jack C Simbach
|
40e41efe28
|
- Azure/BvD updates
|
2021-12-22 14:54:59 -05:00 |
|
justmurphy
|
0de9b09ada
|
Merge pull request #344 from danielhartnell/danielhartnell/update-software-list
Update SOFTWARE-LIST.md
|
2021-12-22 14:46:25 -05:00 |
|
simbaja-ey
|
ec0ff88607
|
Merge branch 'cisagov:develop' into develop
|
2021-12-22 14:46:21 -05:00 |
|
Jack C Simbach
|
ec03c1c3c2
|
Merge remote-tracking branch 'remotes/gov/develop' into develop
|
2021-12-22 14:45:22 -05:00 |
|
justmurphy
|
b8703950e6
|
Merge branch 'develop' into danielhartnell/update-software-list
|
2021-12-22 14:45:10 -05:00 |
|