Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #11

Merged
merged 70 commits into from
Aug 10, 2017
Merged

Develop #11

merged 70 commits into from
Aug 10, 2017

Conversation

david-waltermire
Copy link
Contributor

Merging current development branch back to master.

@wendellpiez
Restructuring for new initiative
fc49e57 
Moved everything into 'old' and added a new subdirectory for new
experiments.
@wendellpiez
More early iteration over names
08ff5d2
@wendellpiez
More adjustments in names mostly
8e602be
@wendellpiez
HTML page for Word import testing
1eab75c
@wendellpiez
Just touchups this time
feef878
@wendellpiez
Updates and misc improvements
4ae65a9
@wendellpiez
Changed document element to 'catalog'
903055a
@wendellpiez
Improved and renamed mapping transformation
4692cbc
@wendellpiez
Adjustments to models, schema, Schematron
2afa705
@wendellpiez
Managing gitignore
9ada685
@wendellpiez
Same
dd0ae3f
@wendellpiez
Minor adjustments
1f5e724
@wendellpiez
First cut at 27K mapping into OSCAL
efeeada
@wendellpiez
Renamed directories for consistency
5203c39
@wendellpiez
Cleanup
d7841e9
@wendellpiez
Bit more cleanup
5ddbf95
@wendellpiez
Adjustments to mapping
86bfeff
@wendellpiez
Same
8a18ef9
@wendellpiez
Numerous enhancements, some reorg
1ee0d25
@wendellpiez
Planning notes
8b5b295
@wendellpiez
Added starter FO XSLT
0a3b812
@wendellpiez
First cut at FO XSL
83df55f
@wendellpiez
Minor improvements
7d12645
@wendellpiez
Small adjustments
1f32d9d
@wendellpiez
Many/much schema enhancements; proto XSD version
985af18
@wendellpiez
First cut at inline declarations with live validation
8f6f09c
@wendellpiez
Implementing declarations; styling
b2353e9
@wendellpiez
Refinements and extensions; new assign, select, withdrawn elements
cb2b4b7
@wendellpiez
More support for parameters etc.
c2c62ad
@wendellpiez
Now implementing parameters etc.
c723314
@wendellpiez
More adjustments
fb2569e
@wendellpiez
Cleanup of obsolete artifacts
61b7998
@wendellpiez
Minor alignment
aeb168f
@wendellpiez
Mostly CSS, also Schematron improvements
db83ce5
@wendellpiez
ISO27002 mapping document
0a5b8cf
@wendellpiez
Many enhancements; new COBIT 5 mappings
4b648a0
@wendellpiez
More on COBIT
588a6a5
@wendellpiez
Improvements to mapping docs
68c57e4
@wendellpiez
Adjustments to mappings incl HTML versions
85ddc7f
@wendellpiez
Moved screenshot for documentation
afb5ece
@wendellpiez
More adjustments and docs
f226a6b
@wendellpiez
Mostly improvements to documentation
05c38f4
@wendellpiez
Refreshed 800-53 data with adjustments
78544e9
@wendellpiez
More general improvements to models and mappings
f52e07b
@wendellpiez
Continuing refinements to validations in samples
c9799c2
@wendellpiez
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
faa39fb
@wendellpiez
Minor tweaks
21d85a8
@wendellpiez
Including initial cut at profiling (1st, rule-based control extractio…
945d909 
…n) among other refinements and improvements
@wendellpiez
No longer extant
033c750
@wendellpiez
Added new control to COBIT5 example
a935920
@wendellpiez
Misc improvements including more COBIT5 support
0fef9c6
@wendellpiez
File rename and further adjustments
6a0e5b4
@wendellpiez
Misc adjustment; SaxonJS demo files
cf3d4a8
@wendellpiez
Misc adjustments
6e74cca
@david-waltermire david-waltermire merged commit 6ae0cb3 into master Aug 10, 2017
david-waltermire added a commit that referenced this pull request Apr 3, 2018
@david-waltermire
# This is a combination of 29 commits.
5b13d9d 
# The first commit's message is:

# This is a combination of 54 commits.
# The first commit's message is:

# This is a combination of 4 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 6 commits.
# The first commit's message is:

# This is a combination of 3 commits.
# The first commit's message is:

# This is a combination of 111 commits.
# The first commit's message is:

Initial commit of docs branch.

# This is the commit message #2:

Create CONTRIBUTING.md
# This is the commit message #3:

Create ROADMAP.md
# This is the commit message #4:

Update README.md
# This is the commit message #5:

Create README.md
# This is the commit message #6:

Update README.md
# This is the commit message #7:

Update README.md
# This is the commit message #8:

Create OSCAL-PRODUCERS.md
# This is the commit message #9:

Create OSCAL-CONSUMERS.md
# This is the commit message #10:

Update and rename OSCAL-CONSUMERS.md to USERS.md
# This is the commit message #11:

Update and rename OSCAL-PRODUCERS.md to IMPLEMENTERS.md
# This is the commit message #12:

Rename CONTRIBUTING.md to CONTRIBUTORS.md
# This is the commit message #13:

Update README.md
# This is the commit message #14:

Update README.md
# This is the commit message #15:

Update USERS.md
# This is the commit message #16:

Update README.md
# This is the commit message #17:

Update IMPLEMENTERS.md
# This is the commit message #18:

Update README.md
# This is the commit message #19:

Update ROADMAP.md
# This is the commit message #20:

Update USERS.md
# This is the commit message #21:

Update CONTRIBUTORS.md
# This is the commit message #22:

Update README.md
# This is the commit message #23:

Update README.md
# This is the commit message #24:

Update IMPLEMENTERS.md
# This is the commit message #25:

Update IMPLEMENTERS.md
# This is the commit message #26:

Rename CONTRIBUTORS.md to CONTRIBUTING.md
# This is the commit message #27:

Create control.md
# This is the commit message #28:

Update control.md
# This is the commit message #29:

Update control.md
# This is the commit message #30:

Update control.md
# This is the commit message #31:

Update control.md
# This is the commit message #32:

Add files via upload
# This is the commit message #33:

Update control.md
# This is the commit message #34:

Create temp.md
# This is the commit message #35:

Delete NIST-SP-800-53-Rev4-AC1.png
# This is the commit message #36:

Add files via upload
# This is the commit message #37:

Delete temp.md
# This is the commit message #38:

Add files via upload
# This is the commit message #39:

Update control.md
# This is the commit message #40:

Add files via upload
# This is the commit message #41:

Add files via upload
# This is the commit message #42:

Update control.md
# This is the commit message #43:

Update CONTRIBUTING.md
# This is the commit message #44:

Update CONTRIBUTING.md
# This is the commit message #45:

Update USERS.md
# This is the commit message #46:

Update CONTRIBUTING.md
# This is the commit message #47:

Delete CONTRIBUTING.md
# This is the commit message #48:

Delete USERS.md
# This is the commit message #49:

Add files via upload
# This is the commit message #50:

Delete CSA-CCM-IAM02.png
# This is the commit message #51:

Update control.md
# This is the commit message #52:

Update control.md
# This is the commit message #53:

Update control.md
# This is the commit message #54:

Update control.md
# This is the commit message #55:

Update control.md
# This is the commit message #56:

Update control.md
# This is the commit message #57:

Update control.md
# This is the commit message #58:

Update control.md
# This is the commit message #59:

Update control.md
# This is the commit message #60:

Update control.md
# This is the commit message #61:

Delete NIST-SP-800-53-AC1-in-OSCAL-XML.png
# This is the commit message #62:

Update README.md
# This is the commit message #63:

Update control.md
# This is the commit message #64:

Update control.md
# This is the commit message #65:

Add files via upload
# This is the commit message #66:

Delete ISO-27001-Control-A9.png
# This is the commit message #67:

Update control.md
# This is the commit message #68:

Add files via upload
# This is the commit message #69:

Add files via upload
# This is the commit message #70:

Delete ISO-27002-Control-9.1.1-part1.png
# This is the commit message #71:

Delete ISO-27002-Control-9.1.1-part2.png
# This is the commit message #72:

Update control.md
# This is the commit message #73:

Update control.md
# This is the commit message #74:

Update control.md
# This is the commit message #75:

Update control.md
# This is the commit message #76:

Update control.md
# This is the commit message #77:

Update README.md
# This is the commit message #78:

Update IMPLEMENTERS.md
# This is the commit message #79:

Add files via upload
# This is the commit message #80:

Delete oscal-layers.png
# This is the commit message #81:

Add files via upload
# This is the commit message #82:

Delete oscal-layers.png
# This is the commit message #83:

Add files via upload
# This is the commit message #84:

Update IMPLEMENTERS.md
# This is the commit message #85:

Update control.md
# This is the commit message #86:

Update IMPLEMENTERS.md
# This is the commit message #87:

Update control.md
# This is the commit message #88:

Rename IMPLEMENTERS.md to docs/prose/IMPLEMENTERS.md
# This is the commit message #89:

Rename IMPLEMENTERS.md to implementers.md
# This is the commit message #90:

Rearranged and outlined catalog documentation based on the conversation with karen and Wendell.

# This is the commit message #91:

Create catalog-xml.md
# This is the commit message #92:

Rename control.md to catalog.md
# This is the commit message #93:

Update catalog.md
# This is the commit message #94:

Update catalog.md
# This is the commit message #95:

Update catalog.md
# This is the commit message #96:

Update catalog-xml.md
# This is the commit message #97:

Update catalog-xml.md
# This is the commit message #98:

Update catalog-xml.md
# This is the commit message #99:

Update catalog-xml.md
# This is the commit message #100:

Update catalog-xml.md
# This is the commit message #101:

Update catalog-xml.md
# This is the commit message #102:

Update catalog-xml.md
# This is the commit message #103:

Update catalog-xml.md
# This is the commit message #104:

Update catalog-xml.md
# This is the commit message #105:

Update catalog-xml.md
# This is the commit message #106:

Docset migration to Slate

# This is the commit message #107:

Removing unused file.

# This is the commit message #108:

Update README.md

Corrected a typo
# This is the commit message #109:

Add files via upload

Graphical representation of OSCAL schemas aligned with Risk Management Framework steps and tasks.
# This is the commit message #110:

Create CONTRIBUTING.md
# This is the commit message #111:

Create ROADMAP.md
# This is the commit message #2:

Create README.md
# This is the commit message #3:

Update README.md
# This is the commit message #2:

Create OSCAL-PRODUCERS.md
# This is the commit message #3:

Create OSCAL-CONSUMERS.md
# This is the commit message #4:

Update and rename OSCAL-CONSUMERS.md to USERS.md
# This is the commit message #5:

Update and rename OSCAL-PRODUCERS.md to IMPLEMENTERS.md
# This is the commit message #6:

Rename CONTRIBUTING.md to CONTRIBUTORS.md
# This is the commit message #2:

Update USERS.md
# This is the commit message #2:

Update IMPLEMENTERS.md
# This is the commit message #2:

Update ROADMAP.md
# This is the commit message #3:

Update USERS.md
# This is the commit message #4:

Update CONTRIBUTORS.md
# This is the commit message #2:

Update IMPLEMENTERS.md
# This is the commit message #3:

Update IMPLEMENTERS.md
# This is the commit message #4:

Rename CONTRIBUTORS.md to CONTRIBUTING.md
# This is the commit message #5:

Create control.md
# This is the commit message #6:

Update control.md
# This is the commit message #7:

Update control.md
# This is the commit message #8:

Update control.md
# This is the commit message #9:

Update control.md
# This is the commit message #10:

Add files via upload
# This is the commit message #11:

Update control.md
# This is the commit message #12:

Create temp.md
# This is the commit message #13:

Delete NIST-SP-800-53-Rev4-AC1.png
# This is the commit message #14:

Add files via upload
# This is the commit message #15:

Delete temp.md
# This is the commit message #16:

Add files via upload
# This is the commit message #17:

Update control.md
# This is the commit message #18:

Add files via upload
# This is the commit message #19:

Add files via upload
# This is the commit message #20:

Update control.md
# This is the commit message #21:

Update CONTRIBUTING.md
# This is the commit message #22:

Update CONTRIBUTING.md
# This is the commit message #23:

Update USERS.md
# This is the commit message #24:

Update CONTRIBUTING.md
# This is the commit message #25:

Delete CONTRIBUTING.md
# This is the commit message #26:

Delete USERS.md
# This is the commit message #27:

Add files via upload
# This is the commit message #28:

Delete CSA-CCM-IAM02.png
# This is the commit message #29:

Update control.md
# This is the commit message #30:

Update control.md
# This is the commit message #31:

Update control.md
# This is the commit message #32:

Update control.md
# This is the commit message #33:

Update control.md
# This is the commit message #34:

Update control.md
# This is the commit message #35:

Update control.md
# This is the commit message #36:

Update control.md
# This is the commit message #37:

Update control.md
# This is the commit message #38:

Update control.md
# This is the commit message #39:

Delete NIST-SP-800-53-AC1-in-OSCAL-XML.png
# This is the commit message #40:

Update README.md
# This is the commit message #41:

Update control.md
# This is the commit message #42:

Update control.md
# This is the commit message #43:

Add files via upload
# This is the commit message #44:

Delete ISO-27001-Control-A9.png
# This is the commit message #45:

Update control.md
# This is the commit message #46:

Add files via upload
# This is the commit message #47:

Add files via upload
# This is the commit message #48:

Delete ISO-27002-Control-9.1.1-part1.png
# This is the commit message #49:

Delete ISO-27002-Control-9.1.1-part2.png
# This is the commit message #50:

Update control.md
# This is the commit message #51:

Update control.md
# This is the commit message #52:

Update control.md
# This is the commit message #53:

Update control.md
# This is the commit message #54:

Update control.md
# This is the commit message #2:

Update IMPLEMENTERS.md
# This is the commit message #3:

Add files via upload
# This is the commit message #4:

Delete oscal-layers.png
# This is the commit message #5:

Add files via upload
# This is the commit message #6:

Delete oscal-layers.png
# This is the commit message #7:

Add files via upload
# This is the commit message #8:

Update IMPLEMENTERS.md
# This is the commit message #9:

Update control.md
# This is the commit message #10:

Update IMPLEMENTERS.md
# This is the commit message #11:

Update control.md
# This is the commit message #12:

Rename IMPLEMENTERS.md to docs/prose/IMPLEMENTERS.md
# This is the commit message #13:

Rename IMPLEMENTERS.md to implementers.md
# This is the commit message #14:

Rearranged and outlined catalog documentation based on the conversation with karen and Wendell.

# This is the commit message #15:

Create catalog-xml.md
# This is the commit message #16:

Rename control.md to catalog.md
# This is the commit message #17:

Update catalog.md
# This is the commit message #18:

Update catalog.md
# This is the commit message #19:

Update catalog.md
# This is the commit message #20:

Update catalog-xml.md
# This is the commit message #21:

Update catalog-xml.md
# This is the commit message #22:

Update catalog-xml.md
# This is the commit message #23:

Update catalog-xml.md
# This is the commit message #24:

Update catalog-xml.md
# This is the commit message #25:

Update catalog-xml.md
# This is the commit message #26:

Update catalog-xml.md
# This is the commit message #27:

Update catalog-xml.md
# This is the commit message #28:

Update catalog-xml.md
# This is the commit message #29:

Fixed typos, updated repo documentation, and migrated documentation for use in Slate.

Corrected a typo (+4 squashed commit)

Squashed commit:

[6ada57f] Removing unused file.

[503ad71] Docset migration to Slate

[351257e] Update catalog-xml.md

[aae1e8b] Add files via upload

Graphical representation of OSCAL schemas aligned with Risk Management Framework steps and tasks.
david-waltermire pushed a commit that referenced this pull request Apr 5, 2018
@wendellpiez @david-waltermire
# This is a combination of 60 commits.
840961c 
# The first commit's message is:

Restructuring for new initiative

Moved everything into 'old' and added a new subdirectory for new
experiments.

More early iteration over names

More adjustments in names mostly

HTML page for Word import testing

Just touchups this time

Updates and misc improvements

Changed document element to 'catalog'

Improved and renamed mapping transformation

Adjustments to models, schema, Schematron

Managing gitignore

Same

Minor adjustments

First cut at 27K mapping into OSCAL

Renamed directories for consistency

Cleanup

Bit more cleanup

Adjustments to mapping

Same

Numerous enhancements, some reorg

Planning notes

Added starter FO XSLT

First cut at FO XSL

Minor improvements

Small adjustments

Many/much schema enhancements; proto XSD version

First cut at inline declarations with live validation

Implementing declarations; styling

Refinements and extensions; new assign, select, withdrawn elements

More support for parameters etc.

Now implementing parameters etc.

More touches

Misc improvements

Sundry adjustments

Many more small improvements

Much documentation

More touchups

Updates

Misc adjustments and notes

Significant rework following design session esp declarations

More improvements incl extending declarations to groups

More adjustments; now mapping SP800-53A also.

More polishing and maintenance

Much more including hierarchical number checking

Adjustments, extensions, corrections

Name changes in the model

More adjustments

Cleanup of obsolete artifacts

Minor alignment

Mostly CSS, also Schematron improvements

ISO27002 mapping document

Many enhancements; new COBIT 5 mappings

More on COBIT

Improvements to mapping docs

Adjustments to mappings incl HTML versions

Moved screenshot for documentation

More adjustments and docs

Mostly improvements to documentation

Refreshed 800-53 data with adjustments

More general improvements to models and mappings

Continuing refinements to validations in samples

Update README.md

Update README.md

Update README.md

Update README.md

Minor tweaks

Including initial cut at profiling (1st, rule-based control extraction) among other refinements and improvements

No longer extant

Added new control to COBIT5 example

Misc improvements including more COBIT5 support

File rename and further adjustments

Misc adjustment; SaxonJS demo files

Misc adjustments

Updated readme contents to reflect merge.

Fixed links.

Changed text to better reflect current state and to add more links.

Rearrangement and cleanup

Schematron and schema adjustment and refactoring

SP800-53 extraction improvement, enhancement, cleanup

Improvements and enhancements to ISO27002 extraction

OSCAL Documentation

COBIT5 example tweakage

Organizational notes

Adjustments

Removed old files directory.
Moved files from draft to root.

Updated README.md to reflect new pathing.

Updated readme to contain more documentation of the OSCAL layers.

Added documentation for the working directory.

Update README.md

Edited the text.

Update README.md

Edited the text.

Added Aug 10 tiger team slides with notes

Create a prose overview of OSCAL

Update OSCAL Overview.md

Update OSCAL Overview.md

Profile and catalog mapping: a trivial example

Replacing graphic with rescaled version

Update OSCAL Overview.md

Rescaled image

Update OSCAL Overview.md

Mods to oXygen project file

Removing 'demo' (till later)

Moved proprietary file

Refinements to ISO27002 mappings (new model)

Refining SP800-53 conversion/mappings

Updating lib support for new model

Top-level org

Draft readme docs

Further adjustment to directory readme.md

More adjustments to ISO 27002 and SP800-53 (new model etc.)

More cleanup to main sample subdirectories + readme tweakage

Mostly restructuring

More adjustments to extraction, parameter support

Includes more model refinements; draft implementation of parameter resolution

Adjustments for revised models

Adjustments to demos and conversion pipelines

Experimenting with profiles

Infrastructure adjustments

Schema modifications

# This is the commit message #2:

Minor correction to schema docs merge
# This is the commit message #3:

Updating XSD w/ docs
# This is the commit message #4:

More element renaming/adjustment
# This is the commit message #5:

Now a stable schema again? With SP800-53 extraction adjustments
# This is the commit message #6:

Profile-related mods

# This is the commit message #7:

Org stuff

# This is the commit message #8:

Moved mappind docs; added readme
# This is the commit message #9:

schema documentation
# This is the commit message #10:

Schema production and documentation pipeline
# This is the commit message #11:

More reorg; tweaked schema; more docs
# This is the commit message #12:

Improvements to tag library
# This is the commit message #13:

Another attempt at internal links in md
# This is the commit message #14:

trying again
# This is the commit message #15:

Gonna get this eventually
# This is the commit message #16:

More updates and tuneups
# This is the commit message #17:

More updates to schema and docs
# This is the commit message #18:

Lighter adjustments
# This is the commit message #19:

Similarly subtle adjustments
# This is the commit message #20:

Adjustments supporting parameter assignments
# This is the commit message #21:

More docs
# This is the commit message #22:

Enhancements to demo
# This is the commit message #23:

Moving distractions out of the way
# This is the commit message #24:

Slight readme tweakage
# This is the commit message #25:

Tag library tweaks
# This is the commit message #26:

More tag library adjustments
# This is the commit message #27:

New readme for Schematrons
# This is the commit message #28:

Adjustments to readme
# This is the commit message #29:

Adjustments to mapping documents
# This is the commit message #30:

Adjustments to readme
# This is the commit message #31:

More adjustments to mapping documents
# This is the commit message #32:

Updated punchlist
# This is the commit message #33:

Updates to mapping docs
# This is the commit message #34:


# This is the commit message #35:

CSS for local editing of OSCAL OSCAL
# This is the commit message #36:

Slight adjustments
# This is the commit message #37:

Light editing
# This is the commit message #38:

Light editing
# This is the commit message #39:

Light edits
# This is the commit message #40:

Light edits
# This is the commit message #41:

Light edits
# This is the commit message #42:

Light edits
# This is the commit message #43:

More work on profiles
# This is the commit message #44:

Revised directory descriptions
# This is the commit message #45:

Added an explanation of the demo directories
# This is the commit message #46:

More on profiling
# This is the commit message #47:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #48:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #49:

Edits to schema documentation
# This is the commit message #50:

More enhancements to tag library and its presentation
# This is the commit message #51:

Internal links?
# This is the commit message #52:

Slight adjustments
# This is the commit message #53:

Further touchups to schema docs and their HTML rendering
# This is the commit message #54:

Support for 'pre'
# This is the commit message #55:

Rearranged and touched up profile experiments
# This is the commit message #56:

More touchups to tag library (linking)
# This is the commit message #57:

More adjustments to copy
# This is the commit message #58:

More adjustments
# This is the commit message #59:

Correcting display bug failing to render chars in CSS
# This is the commit message #60:

Added a PDF with the notes.
david-waltermire pushed a commit that referenced this pull request Apr 13, 2018
@wendellpiez @david-waltermire
# This is a combination of 3 commits.
5131631 
# The first commit's message is:

# This is a combination of 60 commits.
# The first commit's message is:

# This is a combination of 17 commits.
# The first commit's message is:

Restructuring for new initiative

Moved everything into 'old' and added a new subdirectory for new
experiments.

More early iteration over names

More adjustments in names mostly

HTML page for Word import testing

Just touchups this time

Updates and misc improvements

Changed document element to 'catalog'

Improved and renamed mapping transformation

Adjustments to models, schema, Schematron

Managing gitignore

Same

Minor adjustments

First cut at 27K mapping into OSCAL

Renamed directories for consistency

Cleanup

Bit more cleanup

Adjustments to mapping

Same

Numerous enhancements, some reorg

Planning notes

Added starter FO XSLT

First cut at FO XSL

Minor improvements

Small adjustments

Many/much schema enhancements; proto XSD version

First cut at inline declarations with live validation

Implementing declarations; styling

Refinements and extensions; new assign, select, withdrawn elements

More support for parameters etc.

Now implementing parameters etc.

More touches

Misc improvements

Sundry adjustments

Many more small improvements

Much documentation

More touchups

Updates

Misc adjustments and notes

Significant rework following design session esp declarations

More improvements incl extending declarations to groups

More adjustments; now mapping SP800-53A also.

More polishing and maintenance

Much more including hierarchical number checking

Adjustments, extensions, corrections

Name changes in the model

More adjustments

Cleanup of obsolete artifacts

Minor alignment

Mostly CSS, also Schematron improvements

ISO27002 mapping document

Many enhancements; new COBIT 5 mappings

More on COBIT

Improvements to mapping docs

Adjustments to mappings incl HTML versions

Moved screenshot for documentation

More adjustments and docs

Mostly improvements to documentation

Refreshed 800-53 data with adjustments

More general improvements to models and mappings

Continuing refinements to validations in samples

Update README.md

Update README.md

Update README.md

Update README.md

Minor tweaks

Including initial cut at profiling (1st, rule-based control extraction) among other refinements and improvements

No longer extant

Added new control to COBIT5 example

Misc improvements including more COBIT5 support

File rename and further adjustments

Misc adjustment; SaxonJS demo files

Misc adjustments

Updated readme contents to reflect merge.

Fixed links.

Changed text to better reflect current state and to add more links.

Rearrangement and cleanup

Schematron and schema adjustment and refactoring

SP800-53 extraction improvement, enhancement, cleanup

Improvements and enhancements to ISO27002 extraction

OSCAL Documentation

COBIT5 example tweakage

Organizational notes

Adjustments

Removed old files directory.
Moved files from draft to root.

Updated README.md to reflect new pathing.

Updated readme to contain more documentation of the OSCAL layers.

Added documentation for the working directory.

Update README.md

Edited the text.

Update README.md

Edited the text.

Added Aug 10 tiger team slides with notes

Create a prose overview of OSCAL

Update OSCAL Overview.md

Update OSCAL Overview.md

Profile and catalog mapping: a trivial example

Replacing graphic with rescaled version

Update OSCAL Overview.md

Rescaled image

Update OSCAL Overview.md

Mods to oXygen project file

Removing 'demo' (till later)

# This is the commit message #2:

Moved proprietary file

# This is the commit message #3:

Refinements to ISO27002 mappings (new model)

# This is the commit message #4:

Refining SP800-53 conversion/mappings

# This is the commit message #5:

Updating lib support for new model

# This is the commit message #6:

Top-level org

# This is the commit message #7:

Draft readme docs

# This is the commit message #8:

Further adjustment to directory readme.md

# This is the commit message #9:

More adjustments to ISO 27002 and SP800-53 (new model etc.)

# This is the commit message #10:

More cleanup to main sample subdirectories + readme tweakage

# This is the commit message #11:

Mostly restructuring

# This is the commit message #12:

More adjustments to extraction, parameter support

# This is the commit message #13:

Includes more model refinements; draft implementation of parameter resolution

# This is the commit message #14:

Adjustments for revised models

# This is the commit message #15:

Adjustments to demos and conversion pipelines

# This is the commit message #16:

Experimenting with profiles

# This is the commit message #17:

Infrastructure adjustments

# This is the commit message #2:

Minor correction to schema docs merge
# This is the commit message #3:

Updating XSD w/ docs
# This is the commit message #4:

More element renaming/adjustment
# This is the commit message #5:

Now a stable schema again? With SP800-53 extraction adjustments
# This is the commit message #6:

Profile-related mods

# This is the commit message #7:

Org stuff

# This is the commit message #8:

Moved mappind docs; added readme
# This is the commit message #9:

schema documentation
# This is the commit message #10:

Schema production and documentation pipeline
# This is the commit message #11:

More reorg; tweaked schema; more docs
# This is the commit message #12:

Improvements to tag library
# This is the commit message #13:

Another attempt at internal links in md
# This is the commit message #14:

trying again
# This is the commit message #15:

Gonna get this eventually
# This is the commit message #16:

More updates and tuneups
# This is the commit message #17:

More updates to schema and docs
# This is the commit message #18:

Lighter adjustments
# This is the commit message #19:

Similarly subtle adjustments
# This is the commit message #20:

Adjustments supporting parameter assignments
# This is the commit message #21:

More docs
# This is the commit message #22:

Enhancements to demo
# This is the commit message #23:

Moving distractions out of the way
# This is the commit message #24:

Slight readme tweakage
# This is the commit message #25:

Tag library tweaks
# This is the commit message #26:

More tag library adjustments
# This is the commit message #27:

New readme for Schematrons
# This is the commit message #28:

Adjustments to readme
# This is the commit message #29:

Adjustments to mapping documents
# This is the commit message #30:

Adjustments to readme
# This is the commit message #31:

More adjustments to mapping documents
# This is the commit message #32:

Updated punchlist
# This is the commit message #33:

Updates to mapping docs
# This is the commit message #34:

# This is the commit message #35:

CSS for local editing of OSCAL OSCAL
# This is the commit message #36:

Slight adjustments
# This is the commit message #37:

Light editing
# This is the commit message #38:

Light editing
# This is the commit message #39:

Light edits
# This is the commit message #40:

Light edits
# This is the commit message #41:

Light edits
# This is the commit message #42:

Light edits
# This is the commit message #43:

More work on profiles
# This is the commit message #44:

Revised directory descriptions
# This is the commit message #45:

Added an explanation of the demo directories
# This is the commit message #46:

More on profiling
# This is the commit message #47:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #48:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #49:

Edits to schema documentation
# This is the commit message #50:

More enhancements to tag library and its presentation
# This is the commit message #51:

Internal links?
# This is the commit message #52:

Slight adjustments
# This is the commit message #53:

Further touchups to schema docs and their HTML rendering
# This is the commit message #54:

Support for 'pre'
# This is the commit message #55:

Rearranged and touched up profile experiments
# This is the commit message #56:

More touchups to tag library (linking)
# This is the commit message #57:

More adjustments to copy
# This is the commit message #58:

More adjustments
# This is the commit message #59:

Correcting display bug failing to render chars in CSS
# This is the commit message #60:

Added a PDF with the notes.

# This is the commit message #2:

Decided to risk it
# This is the commit message #3:

One more readme
david-waltermire added a commit that referenced this pull request Apr 13, 2018
@david-waltermire
# This is a combination of 7 commits.
05a5fff 
# The first commit's message is:

# This is a combination of 4 commits.
# The first commit's message is:

# This is a combination of 60 commits.
# The first commit's message is:

# This is a combination of 17 commits.
# The first commit's message is:

Restructuring for new initiative

Moved everything into 'old' and added a new subdirectory for new
experiments.

More early iteration over names

More adjustments in names mostly

HTML page for Word import testing

Just touchups this time

Updates and misc improvements

Changed document element to 'catalog'

Improved and renamed mapping transformation

Adjustments to models, schema, Schematron

Managing gitignore

Same

Minor adjustments

First cut at 27K mapping into OSCAL

Renamed directories for consistency

Cleanup

Bit more cleanup

Adjustments to mapping

Same

Numerous enhancements, some reorg

Planning notes

Added starter FO XSLT

First cut at FO XSL

Minor improvements

Small adjustments

Many/much schema enhancements; proto XSD version

First cut at inline declarations with live validation

Implementing declarations; styling

Refinements and extensions; new assign, select, withdrawn elements

More support for parameters etc.

Now implementing parameters etc.

More touches

Misc improvements

Sundry adjustments

Many more small improvements

Much documentation

More touchups

Updates

Misc adjustments and notes

Significant rework following design session esp declarations

More improvements incl extending declarations to groups

More adjustments; now mapping SP800-53A also.

More polishing and maintenance

Much more including hierarchical number checking

Adjustments, extensions, corrections

Name changes in the model

More adjustments

Cleanup of obsolete artifacts

Minor alignment

Mostly CSS, also Schematron improvements

ISO27002 mapping document

Many enhancements; new COBIT 5 mappings

More on COBIT

Improvements to mapping docs

Adjustments to mappings incl HTML versions

Moved screenshot for documentation

More adjustments and docs

Mostly improvements to documentation

Refreshed 800-53 data with adjustments

More general improvements to models and mappings

Continuing refinements to validations in samples

Update README.md

Update README.md

Update README.md

Update README.md

Minor tweaks

Including initial cut at profiling (1st, rule-based control extraction) among other refinements and improvements

No longer extant

Added new control to COBIT5 example

Misc improvements including more COBIT5 support

File rename and further adjustments

Misc adjustment; SaxonJS demo files

Misc adjustments

Updated readme contents to reflect merge.

Fixed links.

Changed text to better reflect current state and to add more links.

Rearrangement and cleanup

Schematron and schema adjustment and refactoring

SP800-53 extraction improvement, enhancement, cleanup

Improvements and enhancements to ISO27002 extraction

OSCAL Documentation

COBIT5 example tweakage

Organizational notes

Adjustments

Removed old files directory.
Moved files from draft to root.

Updated README.md to reflect new pathing.

Updated readme to contain more documentation of the OSCAL layers.

Added documentation for the working directory.

Update README.md

Edited the text.

Update README.md

Edited the text.

Added Aug 10 tiger team slides with notes

Create a prose overview of OSCAL

Update OSCAL Overview.md

Update OSCAL Overview.md

Profile and catalog mapping: a trivial example

Replacing graphic with rescaled version

Update OSCAL Overview.md

Rescaled image

Update OSCAL Overview.md

Mods to oXygen project file

Removing 'demo' (till later)

# This is the commit message #2:

Moved proprietary file

# This is the commit message #3:

Refinements to ISO27002 mappings (new model)

# This is the commit message #4:

Refining SP800-53 conversion/mappings

# This is the commit message #5:

Updating lib support for new model

# This is the commit message #6:

Top-level org

# This is the commit message #7:

Draft readme docs

# This is the commit message #8:

Further adjustment to directory readme.md

# This is the commit message #9:

More adjustments to ISO 27002 and SP800-53 (new model etc.)

# This is the commit message #10:

More cleanup to main sample subdirectories + readme tweakage

# This is the commit message #11:

Mostly restructuring

# This is the commit message #12:

More adjustments to extraction, parameter support

# This is the commit message #13:

Includes more model refinements; draft implementation of parameter resolution

# This is the commit message #14:

Adjustments for revised models

# This is the commit message #15:

Adjustments to demos and conversion pipelines

# This is the commit message #16:

Experimenting with profiles

# This is the commit message #17:

Infrastructure adjustments

# This is the commit message #2:

Minor correction to schema docs merge
# This is the commit message #3:

Updating XSD w/ docs
# This is the commit message #4:

More element renaming/adjustment
# This is the commit message #5:

Now a stable schema again? With SP800-53 extraction adjustments
# This is the commit message #6:

Profile-related mods

# This is the commit message #7:

Org stuff

# This is the commit message #8:

Moved mappind docs; added readme
# This is the commit message #9:

schema documentation
# This is the commit message #10:

Schema production and documentation pipeline
# This is the commit message #11:

More reorg; tweaked schema; more docs
# This is the commit message #12:

Improvements to tag library
# This is the commit message #13:

Another attempt at internal links in md
# This is the commit message #14:

trying again
# This is the commit message #15:

Gonna get this eventually
# This is the commit message #16:

More updates and tuneups
# This is the commit message #17:

More updates to schema and docs
# This is the commit message #18:

Lighter adjustments
# This is the commit message #19:

Similarly subtle adjustments
# This is the commit message #20:

Adjustments supporting parameter assignments
# This is the commit message #21:

More docs
# This is the commit message #22:

Enhancements to demo
# This is the commit message #23:

Moving distractions out of the way
# This is the commit message #24:

Slight readme tweakage
# This is the commit message #25:

Tag library tweaks
# This is the commit message #26:

More tag library adjustments
# This is the commit message #27:

New readme for Schematrons
# This is the commit message #28:

Adjustments to readme
# This is the commit message #29:

Adjustments to mapping documents
# This is the commit message #30:

Adjustments to readme
# This is the commit message #31:

More adjustments to mapping documents
# This is the commit message #32:

Updated punchlist
# This is the commit message #33:

Updates to mapping docs
# This is the commit message #34:

# This is the commit message #35:

CSS for local editing of OSCAL OSCAL
# This is the commit message #36:

Slight adjustments
# This is the commit message #37:

Light editing
# This is the commit message #38:

Light editing
# This is the commit message #39:

Light edits
# This is the commit message #40:

Light edits
# This is the commit message #41:

Light edits
# This is the commit message #42:

Light edits
# This is the commit message #43:

More work on profiles
# This is the commit message #44:

Revised directory descriptions
# This is the commit message #45:

Added an explanation of the demo directories
# This is the commit message #46:

More on profiling
# This is the commit message #47:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #48:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #49:

Edits to schema documentation
# This is the commit message #50:

More enhancements to tag library and its presentation
# This is the commit message #51:

Internal links?
# This is the commit message #52:

Slight adjustments
# This is the commit message #53:

Further touchups to schema docs and their HTML rendering
# This is the commit message #54:

Support for 'pre'
# This is the commit message #55:

Rearranged and touched up profile experiments
# This is the commit message #56:

More touchups to tag library (linking)
# This is the commit message #57:

More adjustments to copy
# This is the commit message #58:

More adjustments
# This is the commit message #59:

Correcting display bug failing to render chars in CSS
# This is the commit message #60:

Added a PDF with the notes.

# This is the commit message #2:

Decided to risk it
# This is the commit message #3:

One more readme
# This is the commit message #4:

Added timestamping to extractors

# This is the commit message #2:

Light edits to oscal-oscal.xml
# This is the commit message #3:

More edits to oscal-oscal.xml with regenerated materials
# This is the commit message #4:

Refining markdown export
# This is the commit message #5:

More edits to docs and rendering
# This is the commit message #6:

This time smaller adjustments
# This is the commit message #7:

More improvements to docs and rendering
wendellpiez referenced this pull request in wendellpiez/OSCAL Mar 11, 2019
@anweiss
Revert 9 docs redesign (#11)
93f202e 
* Feature metaschema d2 next (usnistgov#277)

* Patched with changes from feature-metaschema-d2
* Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure
* Cleanup and refactoring metaschema production for demo
* Patched with changes from feature-metaschema-d2
* Cleanup and refactoring metaschema production for demo
* More adjustments and documentation of metaschema
* Adjustments to metaschema notes doc
* Now supporting namespace assignment per metaschema
* Better support for modular metaschemas
* Metaschema support for namespaces, acquired (imported) models
* Scrubbing old prose modules
* Metaschema XML documentation now respecting namespaces in XML artifacts
* Minor tweaks to comments
* More improvements in view of namespaces. JSON examples not yet working.
* Better handling of examples now
* Removing unneeded test files
* Correcting syntax error
* Adjustments in demo metaschema
* Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata.
* Adding Markdown-conversion and JSON-handling code
* 'Hardening' markdown conversion
* Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested.
* Cleaning up catalog and profile schemas (with namespaces) and examples
* Updated demo schema readme
* Tighter co-occurrence testing

* Docs redesign (#9)

* Create Readme.md

* Create readme.md

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete DesignElements.md

* Add files via upload

* Update Design Elements.md

* Add files via upload

* Update Design Elements.md

* Update Landing Page.md

* Update Landing Page.md

* Update Landing Page.md

* Update Roadmap.md

* Update Roadmap.md

* Update Roadmap.md

* Update Roadmap.md

* Add files via upload

* Update Design Elements.md

* Update Design Elements.md

* Update Case Studies.md

* Update Case Studies.md

* Update Case Studies.md

* Update Case Studies.md

* Update Case Studies.md

* Update Overview.md

* Update Overview.md

* Update Landing Page.md

* Update Roadmap.md

* Update Roadmap.md

* Add files via upload

* Update Design Elements.md

* Update Design Elements.md

* Update Design Elements.md

* Update Design Elements.md

* Update Overview.md

* Update Roadmap.md

* Update Overview.md

* Update Overview.md

* Update Overview.md

* Add files via upload

* Add files via upload

* Add files via upload

* Delete OSCAL_ContentPage_Sample.png

* Update Landing Page.md

* Update Landing Page.md

* Update Content Page.md

* Update Content Page.md

* Update Content Page.md

* Update Products.md

* Update Products.md

* Update Products.md

* Add files via upload

* Update Design Elements.md

* Update Case Studies.md

* Add files via upload

* Delete Products.md

* Delete Roadmap.md

* Update Design Elements.md

* Add files via upload

* Add files via upload

* Update Landing Page.md

* Update Overview.md

* Add files via upload

* Update Get Involved.md

* Update Get Involved.md

* Update Get Involved.md

* Update Get Involved.md

* Update Design Elements.md

* Add files via upload

* Update Design Elements.md

* Update Design Elements.md

* Update Design Elements.md

* Update Design Elements.md

* Delete OSCAL_Logo1.png

* Delete OSCAL_Logo2.png

* Delete OSCAL_Logo3.png

* Delete OSCAL_Logo4.png

* Add files via upload

* Update Design Elements.md

* Delete OSCAL_Logo1.png

* Delete OSCAL_Logo2.png

* Add files via upload

* Delete OSCAL_Logo1.png

* Add files via upload

* Update Readme.md

* Update Get Involved.md

* Rename Case Studies.md to Case Study.md

* Update Case Study.md

* Update Scenario.md

* Update Producer.md

* Update Producer.md

* Update Consumer.md

* Update Consumer.md

* Update Get Involved.md

* Update Producer.md

* Update Consumer.md

* Update Producer.md

* Delete Design Elements.md

* Update Get Involved.md

* Update Consumer.md

* Update Producer.md

* Add files via upload

* Add files via upload

* Update Contact.md

* Update Contact.md

* Update Consumer.md

* Update Producer.md

* Update and rename Overview.md to LearnMore.md

* Rename LearnMore.md to Learn More.md

* Update Contact.md

* Update Contact.md

* Update Learn More.md

* Create Schemas.md

* Update Schemas.md

* Update Schemas.md

* Update Schemas.md

* Create Producer Examples.md

* Update Schemas.md

* Delete Content Page.md

* Update and rename Producer Examples.md to Consumer Examples.md

* Update Scenario.md

* Update Scenario.md

* Delete Landing Page.md

* Update Learn More.md

* Update Learn More.md

* Update Learn More.md

* Update Learn More.md

* Update Learn More.md

* Update Learn More.md

* Update Learn More.md

* Feature metaschema d2 next (usnistgov#277)

* Patched with changes from feature-metaschema-d2
* Moving testing schema into schema/demo dir for more robust testing of (portable, replicable) metaschema infrastructure
* Cleanup and refactoring metaschema production for demo
* Patched with changes from feature-metaschema-d2
* Cleanup and refactoring metaschema production for demo
* More adjustments and documentation of metaschema
* Adjustments to metaschema notes doc
* Now supporting namespace assignment per metaschema
* Better support for modular metaschemas
* Metaschema support for namespaces, acquired (imported) models
* Scrubbing old prose modules
* Metaschema XML documentation now respecting namespaces in XML artifacts
* Minor tweaks to comments
* More improvements in view of namespaces. JSON examples not yet working.
* Better handling of examples now
* Removing unneeded test files
* Correcting syntax error
* Adjustments in demo metaschema
* Added draft metadata to SP800-53 profiles; also new SP800-53 catalog with (draft) metadata.
* Adding Markdown-conversion and JSON-handling code
* 'Hardening' markdown conversion
* Adding placeholder files for new catalog and profile metaschemas with namespace support - nb namespaces assigned have not been changed. But namespace support in the metaschema infrastructure can be tested.
* Cleaning up catalog and profile schemas (with namespaces) and examples
* Updated demo schema readme
* Tighter co-occurrence testing

* docs redesign prototype

* add Docker artifacts for dev

* volume mount quotes

* walkthrough prototype

* add walkthrough page

* use official nist header and foot

* initial refactor based on new site map

* site nav prototyping

* oscalkit addition

* Test

* fix sidenav and schema ref

* Early version JSON-docs production from metaschema

* Removed unwanted namespace declarations from XML samples

* Removed unwanted namespace declaration from XML samples

* Experiments with serialization of XML literals in JSON from XSLT pipeline

* Travis website updates (#3)

* Website Updates - Splash Page

* fix sidenav and schema ref

* Updates based on initial NIST feedback (#4)

* relationship page per Wendell (#5)

* Setting up metaschema documentation -- HTML feed for Jekyll

* Improved serialization on working example

* Improved serialization

* Now added uswds tables

* Now including JSON examples

* On XML and JSON examples, now emulating mockup with hooks for Jekyll/uswds CSS and scripting

* More enhancements to schema docs

* Adding catalog schema docs as HTML fragments

* Testing documentation handling

* Testing documentation; metaschema Schematron adjustment

* Adding YAML header to top level file

* Reverting back to safer version

* Now including docs for elements included in metaschemas via import from other metaschemas (35 new files) usnistgov#286 usnistgov#314

* Provided descriptive YAML headers to HTML outputs from metaschema docs production for Jekyll integration.

* New file set in correct subdirectory for Jekyll

* Removing extraneous file left from debugging

* Removing diagnostic output from metaschema docs generation

* Corrected production of header id for navigation

* Providing some simple tagging for syntax coloring over XML literals

* Improvements to representation of samples in schema docs, now to use Jekyll syntax highlighting.

* Moving the documentation outputs to a path for Jekyll

* More corrections to samples serializations

* merge split html from metaschema

* JSON prettify block

* Initial Schema Formatting

* css changes

* Revert "Docs redesign (#9)"

This reverts commit ef1e5a9.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@david-waltermire @wendellpiez