Lcerkov
6e7cf1024b
Merge pull request #429 from jeis4wpi/develop
...
fix some typos if this helps?
2022-01-11 15:19:33 -07:00
Lcerkov
84084ad508
Merge branch 'develop' into develop
2022-01-11 15:18:24 -07:00
Nick
3bdf491840
Merge branch 'develop' into contributing-adjustments
2022-01-11 15:15:40 -05:00
Nick
119c1a405a
Merge pull request #432 from cisagov/maintenance/update_from_skeleton-generic
...
Pull in updates from cisagov/skeleton-generic
2022-01-11 15:15:12 -05:00
Nicholas McDonnell
93411319c9
Add missing cisagov/action-lineage configuration
...
This configuration will allow testing configuration updates to flow
down automatically.
2022-01-11 14:50:44 -05:00
Nicholas McDonnell
e1e9b86c3c
Merge github.com:cisagov/skeleton-generic into maintenance/update_from_skeleton-generic
2022-01-11 14:50:24 -05:00
Nick
11eca90f4d
Merge pull request #95 from cisagov/improvement/update_ansible-lint_configuration
...
Update `ansible-lint` Configuration
2022-01-11 14:28:08 -05:00
Lcerkov
45996616d5
Merge pull request #431 from bryns-j-matillion/matillion
...
Update SOFTWARE-LIST.md
2022-01-11 12:26:41 -07:00
Nick
6e652ec235
Merge branch 'develop' into improvement/update_ansible-lint_configuration
2022-01-11 14:22:20 -05:00
Nick
115af25726
Merge pull request #97 from cisagov/maintenance/update_pre-commit_hooks
...
Update `pre-commit` hooks
2022-01-11 14:22:06 -05:00
Lcerkov
127ecf3c7d
Update PULL-EXAMPLE.md
...
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
2022-01-11 12:17:44 -07:00
Lcerkov
02417c2b5d
Update PULL-EXAMPLE.md
...
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
2022-01-11 12:17:29 -07:00
Nicholas McDonnell
3f370ebdde
Update pre-commit hooks
...
Update pre-commit hooks using `pre-commit autoupdate`.
2022-01-11 14:03:38 -05:00
Lcerkov
6a3119c13b
Update README.md
...
Added a subsection into the README that links to PULL-EXAMPLE.md and instructions for web UI PR
2022-01-11 10:17:42 -05:00
Lcerkov
6271441a2b
Update CONTRIBUTING.md
...
Adding a subsection into the "Creating a Pull Request" section that points to the PR Example and instructions for web UI PR
2022-01-11 10:15:59 -05:00
Lcerkov
35107945ac
Update README.md
...
Adding Contributing section back into README
2022-01-11 10:07:08 -05:00
Bryns Jones
67870561e9
Update SOFTWARE-LIST.md
2022-01-11 14:49:52 +00:00
Lcerkov
a9371e1744
Update CONTRIBUTING.md
...
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
2022-01-11 07:45:19 -07:00
Lcerkov
f55681ea52
Update PULL-EXAMPLE.md
...
Co-authored-by: Nick <50747025+mcdonnnj@users.noreply.github.com>
2022-01-11 07:44:47 -07:00
Lcerkov
edddfc39a8
Update PULL-EXAMPLE.md
2022-01-10 13:45:14 -07:00
Lcerkov
b979fda073
Update PULL-EXAMPLE.md
...
Fixing template
2022-01-10 13:43:15 -07:00
Lcerkov
38fe6123ee
Update PULL-EXAMPLE.md
...
Fixed trailing white space
2022-01-10 14:03:12 -05:00
Lcerkov
87560c6ad2
Update PULL-EXAMPLE.md
...
Co-authored-by: dav3r <david.redmin@trio.dhs.gov>
2022-01-10 12:00:26 -07:00
Lcerkov
2a9e08f4fd
Merge branch 'develop' into contributing-adjustments
2022-01-10 11:12:51 -07:00
Lcerkov
3a7afc737b
Update PULL-EXAMPLE.md
2022-01-10 11:11:44 -07:00
Lcerkov
0ae6e979a5
Update PULL-EXAMPLE.md
2022-01-10 11:10:45 -07:00
Lcerkov
592e641954
Update PULL-EXAMPLE.md
2022-01-10 11:07:38 -07:00
Lcerkov
a8dc8f1724
Update PULL-EXAMPLE.md
2022-01-10 11:06:24 -07:00
Lcerkov
e2070dc551
Update PULL-EXAMPLE.md
2022-01-10 11:02:34 -07:00
Lcerkov
c2ce20ea8e
Update PULL-EXAMPLE.md
2022-01-10 10:55:58 -07:00
Lcerkov
c54a8c7531
Update PULL-EXAMPLE.md
2022-01-10 10:51:47 -07:00
Lcerkov
58e0e69c12
Update PULL-EXAMPLE.md
...
Fixing line length issues, header issue
2022-01-10 10:42:13 -07:00
John E
adef6f3c41
fix some typos if this helps?
2022-01-07 12:43:49 -05:00
iainDe
1434cb5da7
Merge pull request #427 from CARR-Josh/patch-1
...
Update SOFTWARE-LIST.md. Thank you for Contributing!
2022-01-06 17:33:15 -05:00
iainDe
61f2be6c1e
Merge branch 'develop' into patch-1
2022-01-06 17:32:31 -05:00
iainDe
52bfcee6a8
Update SOFTWARE-LIST.md
...
Adding Vulnerability Status
2022-01-06 17:32:09 -05:00
iainDe
78c3551305
Merge branch 'develop' into contributing-adjustments
2022-01-06 17:22:58 -05:00
Lcerkov
f9578cd49b
Merge pull request #428 from inl-ics/develop
...
Update SOFTWARE-LIST.md
2022-01-06 15:49:53 -05:00
Lcerkov
4432cb5524
Update SOFTWARE-LIST.md
2022-01-06 14:35:35 -05:00
Chris Sullivan
c41e5ef89e
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:44:05 -05:00
Chris Sullivan
7ca08081f8
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:43:53 -05:00
Chris Sullivan
1140f68912
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:41:23 -05:00
Chris Sullivan
950b7783ad
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:41:03 -05:00
Chris Sullivan
52255cac94
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:30:35 -05:00
Chris Sullivan
6884799b62
Update PULL-EXAMPLE.md
...
Co-authored-by: Shane Frasier <jeremy.frasier@trio.dhs.gov>
2022-01-06 13:28:54 -05:00
inl-ics
337cfa956b
Update SOFTWARE-LIST.md
...
Added Daktronics, updated COPADATA, added Edwards
2022-01-06 09:31:38 -07:00
iainDe
d3709351c8
Merge branch 'develop' into contributing-adjustments
2022-01-06 11:19:35 -05:00
iainDe
ae7e10c05c
Merge pull request #426 from inl-ics/develop
...
Update SOFTWARE-LIST.md
2022-01-06 06:22:52 -05:00
iainDe
9490f075c9
Update PULL-EXAMPLE.md
...
Changes made as suggested by @chelsgr
2022-01-06 05:17:09 -06:00
inl-ics
b40ae37500
Update SOFTWARE-LIST.md
...
Added Digital Alert Systems, HMS Industrial networks, Janitza, Meinberg, MMM Group, National Instruments, Sierra Wireless, SISCO, SMA Solar tech, spacelabs Healthcare
2022-01-05 16:01:38 -07:00
