Plan Status: #1031 was successful
Build: #903 was successful
Build Result Summary
Details
- Trigger
- Code has been updated by Ben Zheng <ben.zheng@reyosoft.com>, Andrew Reeves <andrew.reeves@endeavorsystems.com>.
- Revisions
-
- Plan Repository
- b0e9f7009c26646c300c44b4455c4d913682933a
- Agent
- Default Agent
- Completed
- Duration
- 2 minutes
- Successful since
- #897 ()
- Labels
- None
Code Changes
Plan Repository
-
Andrew Reeves <andrew.reeves@endeavorsystems.com> b0e9f7009c26646c300c44b4455c4d913682933a
Merge remote-tracking branch 'origin/ofj1655'
Conflicts:
public/javascripts/Fisma/Calendar-min.js
public/javascripts/combined-min.js
public/javascripts/combined.js
public/javascripts/editable-min.js
public/stylesheets/ie7hacks-min.css -
Ben Zheng <ben.zheng@reyosoft.com> cabd284bbcef3f1107efc59878052a76375ff1a0
OFJ-1655 The ECD date select panel cannot be closed by clicking the X icon when the panel opens twice on finding detail page
Fix defects from OFC-524.
1. Remove validateEcd() function from Finding.js.
2. Remove Fisma.Finding.validateEcd() from Calendar.js
3. Remove 'todo' from mitigation-strategy.ajax.phtml.
JIRA Issues
-
OFC-524
-
OFJ-1655