Andrew Reeves <andrew.reeves@endeavorsystems.com>: Author Summary

OFJ-1742 Add NIST 800-79 Control Catalog

Remove 'class' field from schema and fixtures.
Removed "class" from single-control display script.
Added 800-79 catalog
Added DO-1 for 800-79 catalog
Add the rest of the controls.
Added menu item, controller, form and indexing.
Added privileges.
Added index listener to model.

Add names to 800-79 controls.

Added description, visible and defaultCatalog fields to catalog model.
Added new boolean dynamicField to SOLR configuration.
Added new fields to the indexing and to the form.

Added filter for control visibility to autocomplete.

Removed default catalog field.
Renamed fields in control view.

Update autocomplete to show 500 results instead of 20.
Add a new boolean table formatter and set up search to use it for boolean fields.
Reorder and rename fields.
Change "visible" to "published".
Hide empty fields in single control view.
Add descriptions and change description to be a rich-edit field.

Remove Default Catalog setting

Remove default security control catalog and catalog section from finding injection.

Security Control Catalog form tweaks.

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1823' into release-2.17

Merge remote-tracking branch 'origin/ofj1825' into release-2.17

Conflicts:
        public/javascripts/Fisma/FindingWorkflow.js

Merge remote-tracking branch 'origin/ofj1785' into release-2.17

Merge remote-tracking branch 'origin/ofj1830' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/ofj1831' into release-2.17

OFJ-1742 Add NIST 800-79 Control Catalog

Remove 'class' field from schema and fixtures.
Removed "class" from single-control display script.
Added 800-79 catalog
Added DO-1 for 800-79 catalog
Add the rest of the controls.
Added menu item, controller, form and indexing.
Added privileges.
Added index listener to model.

Add names to 800-79 controls.

Added description, visible and defaultCatalog fields to catalog model.
Added new boolean dynamicField to SOLR configuration.
Added new fields to the indexing and to the form.

Added filter for control visibility to autocomplete.

Removed default catalog field.
Renamed fields in control view.

Update autocomplete to show 500 results instead of 20.
Add a new boolean table formatter and set up search to use it for boolean fields.
Reorder and rename fields.
Change "visible" to "published".
Hide empty fields in single control view.
Add descriptions and change description to be a rich-edit field.

Remove Default Catalog setting

Remove default security control catalog and catalog section from finding injection.

Merge remote-tracking branch 'origin/ofj1776' into release-2.17

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1823' into release-2.17

Merge remote-tracking branch 'origin/ofj1825' into release-2.17

Conflicts:
        public/javascripts/Fisma/FindingWorkflow.js

Merge remote-tracking branch 'origin/ofj1826' into release-2.17

Merge remote-tracking branch 'origin/ofj1785' into release-2.17

Merge remote-tracking branch 'origin/ofj1830' into release-2.17

Merge remote-tracking branch 'origin/ofj1831' into release-2.17

Merge remote-tracking branch 'origin/ofj1776' into release-2.17

Admin: Correct merge error.

Admin: Correct merge error.

Merge remote-tracking branch 'origin/ofj1793' into release-2.17

OFJ-1793 Refactor the ImagePicker.js constructor

Done.

Merge branch 'release-2.17'

Admin: Correct column options in migration Application_Migration_021702_FindingWorkflowExtended

Admin: Move erroneously tagged migrations to 021702.

Merge remote-tracking branch 'origin/ofj1820'

Merge remote-tracking branch 'origin/ofj1300' into release-2.17

Merge remote-tracking branch 'origin/ofj1827' into release-2.17

Conflicts:
        application/doctrine/data/fixtures/Migration.yml

Merge remote-tracking branch 'origin/ofj1826' into release-2.17

Merge branch 'release-2.17'

Conflicts:
        public/javascripts/Fisma/Util.js

Merge remote-tracking branch 'origin/release-2.17'

Merge remote-tracking branch 'origin/ofj1712'

Admin: Add executable bit to SOLR init script.

Merge remote-tracking branch 'origin/release-2.17'

Admin: Update version number.

OFJ-1643 Migrations for new fIle upload logic

Migration for schema changes.
Fix migration data fixture.
Removed MigrationVersion model class.
Change createTable() to handle multi-column primary keys

OFJ-1643 Migrations for new fIle upload logic

Migration for schema changes.
Fix migration data fixture.
Removed MigrationVersion model class.
Change createTable() to handle multi-column primary keys

Merge remote-tracking branch 'origin/ofj1741'

Merge remote-tracking branch 'origin/ofj1741'

Merge remote-tracking branch 'origin/ofj1720'

Merge remote-tracking branch 'origin/ofj1704'

Merge remote-tracking branch 'origin/ofj1241'

Conflicts:
        public/javascripts/Fisma/Calendar-min.js
        public/javascripts/Fisma/Chart-min.js
        public/javascripts/combined-min.js
        public/javascripts/combined.js

OFJ-1241 Remove combined/minified files from git repo

Add .gitignore files for untracked JS and CSS

OFJ-1241 Remove combined/minified files from git repo

Remove combined/minified files from source control.

OFJ-1241 Remove combined/minified files from git repo

Remove unused minified files.

OFJ-1241 Remove combined/minified files from git repo

Include login.css and print.css in the list of minified CSS files.
Update public/stylesheets/.gitignore file.

Merge remote-tracking branch 'origin/ofj1612'

Admin: Remove obvolete Fisma_Doctrine_Behavior_AttachArtifacts_Generator unit tests.

Merge remote-tracking branch 'origin/ofj1622'

Admin: Remove MigrationVersion tests

Merge remote-tracking branch 'origin/ofj131'

Merge remote-tracking branch 'origin/ofj1600'

Conflicts:
        public/javascripts/combined-min.js

Merge remote-tracking branch 'origin/ofj1629'

Merge remote-tracking branch 'origin/ofj1615'

Merge remote-tracking branch 'origin/ofj1638'

Merge remote-tracking branch 'origin/ofj1594'

Merge remote-tracking branch 'origin/ofj1433'

Conflicts:
        public/javascripts/combined-min.js

Merge branch 'release-2.16'

Merge remote-tracking branch 'origin/ofj1626'

Merge remote-tracking branch 'origin/ofj837'

Conflicts:
        application/modules/default/controllers/SystemController.php
        library/Fisma/Cli/GenerateFindings.php
        library/Fisma/Cli/GenerateIncidents.php
        library/Fisma/Cli/GenerateSystems.php

Admin: Remove unused model classes which break the build

Merge remote-tracking branch 'origin/ofj678'

Conflicts:
        application/models/Finding.php
        application/modules/finding/controllers/RemediationController.php
        public/javascripts/combined-min.js
        public/javascripts/combined.js

Merge remote-tracking branch 'origin/ofj1611'

Conflicts:
        public/javascripts/combined-min.js

Merge remote-tracking branch 'origin/ofj1325'

OFJ-1572 Security control information is not reloaded after select a different security control on the finding detail page

Modify form to use correct attribute fore callback.
Modify Fisma.Finding.setupSecurityControlAutocomplete() to bind the correct subscriber.

Merge remote-tracking branch 'origin/ofj1329'

Merge remote-tracking branch 'origin/ofj1585'

Admin: Updated application version string

Merge remote-tracking branch 'origin/ofj1644'

Merge remote-tracking branch 'origin/ofj1837' into release-2.17

Merge remote-tracking branch 'origin/ofj1835' into release-2.17

Merge remote-tracking branch 'origin/ofj1823' into release-2.17

Merge remote-tracking branch 'origin/ofj1825' into release-2.17

Conflicts:
        public/javascripts/Fisma/FindingWorkflow.js

Merge remote-tracking branch 'origin/ofj1785' into release-2.17

Merge remote-tracking branch 'origin/ofj1830' into release-2.17

Merge remote-tracking branch 'origin/ofj1840' into release-2.17

Merge remote-tracking branch 'origin/ofj1831' into release-2.17

OFJ-1742 Add NIST 800-79 Control Catalog

Remove 'class' field from schema and fixtures.
Removed "class" from single-control display script.
Added 800-79 catalog
Added DO-1 for 800-79 catalog
Add the rest of the controls.
Added menu item, controller, form and indexing.
Added privileges.
Added index listener to model.

Add names to 800-79 controls.

Added description, visible and defaultCatalog fields to catalog model.
Added new boolean dynamicField to SOLR configuration.
Added new fields to the indexing and to the form.

Added filter for control visibility to autocomplete.

Removed default catalog field.
Renamed fields in control view.

Update autocomplete to show 500 results instead of 20.
Add a new boolean table formatter and set up search to use it for boolean fields.
Reorder and rename fields.
Change "visible" to "published".
Hide empty fields in single control view.
Add descriptions and change description to be a rich-edit field.

Remove Default Catalog setting

Remove default security control catalog and catalog section from finding injection.

Merge remote-tracking branch 'origin/ofj1776' into release-2.17

Admin: Fix jslint error.

Admin: Fixed the last couple JSLint errors not addressed by OFJ-1613

Merge remote-tracking branch 'origin/ofj1704'

Merge remote-tracking branch 'origin/ofj1657'

Merge remote-tracking branch 'origin/ofj1622'

Admin: Remove MigrationVersion tests

Merge remote-tracking branch 'origin/ofj1683'

Merge remote-tracking branch 'origin/ofj1638'

Merge remote-tracking branch 'origin/ofj1647'

Admin: Remove unused model classes which break the build

Merge remote-tracking branch 'origin/ofj1611'

Conflicts:
        public/javascripts/combined-min.js

Admin: Remove obsolete tests.

Merge remote-tracking branch 'origin/ofj1680'

Conflicts:
        public/javascripts/combined-min.js

Admin: Remove obvolete Fisma_Doctrine_Behavior_AttachArtifacts_Generator unit tests.

OFJ-837 Consolidate file upload logic

Addresses http://crucible.openfisma.org/cru/OFC-509#c3379
Addresses http://crucible.openfisma.org/cru/OFC-509#c3421
Addresses http://crucible.openfisma.org/cru/OFC-509#c3422
Addresses http://crucible.openfisma.org/cru/OFC-509#c3424
Addresses http://crucible.openfisma.org/cru/OFC-509#c3426
Addresses http://crucible.openfisma.org/cru/OFC-509#c3427
Addresses http://crucible.openfisma.org/cru/OFC-509#c3429
Addresses http://crucible.openfisma.org/cru/OFC-509#c3430

Merge remote-tracking branch 'origin/ofj1672'

Merge remote-tracking branch 'origin/ofj1659'

Conflicts:
        public/javascripts/combined-min.js

Merge remote-tracking branch 'origin/ofj131'

Merge remote-tracking branch 'origin/ofj1600'

Conflicts:
        public/javascripts/combined-min.js

Merge remote-tracking branch 'origin/ofj1629'

Merge remote-tracking branch 'origin/ofj1615'

Merge remote-tracking branch 'origin/ofj1594'

Merge remote-tracking branch 'origin/ofj1658'

Conflicts:
        public/javascripts/Fisma/Calendar.js
        tests/library/Fisma/Doctrine/Cli.php

Merge remote-tracking branch 'origin/ofj1433'

Conflicts:
        public/javascripts/combined-min.js

Merge remote-tracking branch 'origin/ofj1569'

Admin: Fix botched merge and reminified.

Merge remote-tracking branch 'origin/ofj1626'

Merge remote-tracking branch 'origin/ofj837'

Conflicts:
        application/modules/default/controllers/SystemController.php
        library/Fisma/Cli/GenerateFindings.php
        library/Fisma/Cli/GenerateIncidents.php
        library/Fisma/Cli/GenerateSystems.php

Merge remote-tracking branch 'origin/ofj678'

Conflicts:
        application/models/Finding.php
        application/modules/finding/controllers/RemediationController.php
        public/javascripts/combined-min.js
        public/javascripts/combined.js

Merge remote-tracking branch 'origin/ofj1329'

Merge remote-tracking branch 'origin/ofj1585'

Merge remote-tracking branch 'origin/ofj1644'

Admin: Remove obsolete tests.