Plan Status: #1031 was successful
Build: #896 failed
Code Changes
Code has been updated by Andrew Reeves <andrew.reeves@endeavorsystems.com>.
Plan Repository
-
Andrew Reeves <andrew.reeves@endeavorsystems.com> 1d1c3d069b8115439c3081ccd9040a47d64398f8
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 -
Andrew Reeves <andrew.reeves@endeavorsystems.com> d8f55f23ce7af0a1181b614b6c5df7d59217f3df
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. -
Andrew Reeves <andrew.reeves@endeavorsystems.com> 0ed2da651066a4e9ae279c49191d0937b21372c0
OFJ-1241 Remove combined/minified files from git repo
Add .gitignore files for untracked JS and CSS -
Andrew Reeves <andrew.reeves@endeavorsystems.com> 8902d5fa9d84be918928c50d227e38bd4333f649
OFJ-1241 Remove combined/minified files from git repo
Remove combined/minified files from source control.- public/javascripts/combined-min.js (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/javascripts/combined.js (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/javascripts/excanvas-min.js (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/combined-min.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/combined.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/ie6hacks-min.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/ie7hacks-min.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/ie8hacks-min.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
- public/stylesheets/ie9hacks-min.css (version 8902d5fa9d84be918928c50d227e38bd4333f649) (diffs)
-
Andrew Reeves <andrew.reeves@endeavorsystems.com> 356458137c9156441bb1ff8b76d8c779c54cae4c
OFJ-1241 Remove combined/minified files from git repo
Remove unused minified files.- public/javascripts/Fisma-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/AttachArtifacts-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/AutoComplete-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Blinker-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Calendar-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Chart-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/CheckboxTree-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Commentable-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Email-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Finding-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/FindingSummary-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Highlighter-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/HtmlPanel-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Incident-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Ldap-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Menu-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/MessageBox-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/MessageBoxStack-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Module-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Organization-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/OrganizationTreeView-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/PersistentStorage-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/PocTreeView-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Registry-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Remediation-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Role-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/Criteria-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/CriteriaDefinition-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/CriteriaQuery-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/CriteriaRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/Panel-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/QueryState-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Search/TablePreferences-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/SessionManager-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Spinner-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Storage-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/SwitchButton-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/System-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/SystemAggregationView-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/TabView-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/TabView/Roles-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/TableFormat-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/TreeNodeDragBehavior-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/TreeTable-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/UrlPanel-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/User-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Util-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/Vulnerability-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/Fisma/ZfDebugYuiLogging-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/editable-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/groupeddatatable-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/core/jquery_jqplot-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/plugins/jqplot_canvasAxisLabelRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/plugins/jqplot_canvasAxisTickRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/plugins/jqplot_canvasTextRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/plugins/jqplot_categoryAxisRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/plugins/jqplot_highlighter-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/renderers/jqplot_barRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/renderers/jqplot_pieRenderer-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jqPlot/renderers/jqplot_pointLabels-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/jquery_jqplot_min-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/php-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/selectallselectnone-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/javascripts/tiny_mce_config-min.js (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/AttachArtifacts-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/AutoComplete-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Dashboard-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Finding-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Incident-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/MessageBox-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Modules-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Search-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/SwitchButton-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/Toolbar-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/TreeNodeDragBehavior-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/TreeTable-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/User-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/chart-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/datatablegrouper-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/install-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/jquery_jqplot-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/login-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/main-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/print-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- public/stylesheets/tinymce-min.css (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)
- scripts/build/build.xml (version 356458137c9156441bb1ff8b76d8c779c54cae4c) (diffs)