Skip to content

Commit 51a7567

Browse files
alinh-mitrealinh-mitre
committed
resolve merge conflict and accepting new change from dev
2 parents 15762a6 + 1f2db92 commit 51a7567

9 files changed

Lines changed: 167 additions & 208 deletions

File tree

‎src/assets/data/boardCharter.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
{"subSectionId": "member_backgrounds",
1515
"subSectionTitle": "Board Member Backgrounds",
16-
"subSectionParagraphs": ["Board members are not limited to but traditionally fit into one or more of the following categories:<ul><li><b>Technical Implementers</b> provide input and guidance regarding the creation, design, review, maintenance, and applications of CVE List entries (<a href='/ResourcesSupport/FAQs#pc_cve_recordswhat_is_cve_record' target='_blank'>CVE Entries</a>). This may include individuals who integrate CVE Entries into products, such as content and development engineers working for product vendors, and others who consume CVE Entries.</li><li><b>Subject Matter Experts (SMEs)</b> represent a significant constituency related to &mdash; or affected by &mdash; CVE, and are domain experts in the vulnerability management and reporting field. These members may include representatives from product vendors who represent the needs of their company, such as PSIRT team members, or product managers and product strategists who are representing customers.</li><li><b>Advocates</b> actively support or promote CVE in a highly visible fashion. These individuals are respected leaders within the security community who help bring credibility to CVE and give it a wider reach outside of the security community.</li></ul>"],
16+
"subSectionParagraphs": ["Board members are not limited to but traditionally fit into one or more of the following categories:<ul><li><b>Technical Implementers</b> provide input and guidance regarding the creation, design, review, maintenance, and applications of CVE List records (<a href='/ResourcesSupport/FAQs#pc_cve_recordswhat_is_cve_record' target='_blank'>CVE Records</a>). This may include individuals who integrate CVE Records into products, such as content and development engineers working for product vendors, and others who consume CVE Records.</li><li><b>Subject Matter Experts (SMEs)</b> represent a significant constituency related to &mdash; or affected by &mdash; CVE, and are domain experts in the vulnerability management and reporting field. These members may include representatives from product vendors who represent the needs of their company, such as PSIRT team members, or product managers and product strategists who are representing customers.</li><li><b>Advocates</b> actively support or promote CVE in a highly visible fashion. These individuals are respected leaders within the security community who help bring credibility to CVE and give it a wider reach outside of the security community.</li></ul>"],
1717
"subSubSections":[]
1818
},
1919
{"subSectionId": "structure",

‎src/assets/data/cnaRules.json‎

Lines changed: 123 additions & 130 deletions
Large diffs are not rendered by default.

‎src/assets/data/navigation.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
"Past Sponsors": {
3131
"anchorId": "PastSponsors",
3232
"label": "Past Sponsors"
33-
},
34-
"CVE Senior Advisory Council (2001-2005)": {
35-
"anchorId": "CVESeniorAdvisoryCouncil2001-2005",
36-
"label": "CVE Senior Advisory Council (2001-2005)"
3733
}
3834
}
3935
},

‎src/components/HomeModule.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
<h3 class="cve-hidden">CVE partnership</h3>
1010
<p class="subtitle cve-subtitle has-text-centered">
1111
The CVE Program partners with community members worldwide to grow CVE content and expand its usage. Click below to learn more
12-
about the role of <router-link to="/About/Glossary?activeTerm=glossaryCNA">CVE Numbering Authorities(CNAs)</router-link>,
13-
<router-link to="/About/Glossary?activeTerm=glossaryRoot">Root CNAs</router-link>, and
14-
Authorized Data Publishers.
12+
about the role of <router-link to="/About/Glossary?activeTerm=glossaryCNA">CVE Numbering Authorities(CNAs)</router-link>, and
13+
<router-link to="/About/Glossary?activeTerm=glossaryRoot">Roots</router-link>.
1514
</p>
1615
<div class="buttons is-centered">
1716
<router-link to="/PartnerInformation/Partner" class="button cve-button cve-button-base-color">Learn More</router-link>

‎src/components/HomePageSidebarModule.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</span>
103103
</td>
104104
<td>
105-
<p class="is-capitalized">{{event.title}}</p>
105+
<p class="">{{event.title}}</p>
106106
<p class="is-capitalized cve-help-text">
107107
<span v-if="event.date.repeat">
108108
{{event.date.repeat.recurrence == 'biweekly' ? 'Every other ' : 'Every'}} {{event.date.repeat.day}}

‎src/views/About/History.vue‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<div class="content">
77
<h1 :id="cvenavs['About']['submenu']['History']" class="title">
88
{{cvenavs['About']['submenu']['History']['label']}}</h1>
9-
<p class="cve-help-text">Most of the links below will take you to external websites
10-
<span class="icon cve-icon-xxs help-text-icon"><font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSiteLinks"/>
11-
</span>; these links
12-
will open in a new window or tab depending on your browser.</p>
9+
<p class="cve-help-text">The majority of the links on this page redirects to external websites
10+
<span class="icon cve-icon-xxs help-text-icon"><font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSiteLinks"/>
11+
</span>; these links will open a new window or tab depending in the web browser used.
12+
</p>
1313
<h2 :id="cvenavs['About']['submenu']['History']['items']['Overview']['anchorId']" class="title cve-heading-top-spacing">
1414
{{cvenavs['About']['submenu']['History']['items']['Overview']['label']}}</h2>
1515
<p>
@@ -34,7 +34,7 @@
3434
incorporating CVE Records.
3535
</p>
3636
<p>
37-
Another significant factor to adoption is the ongoing inclusion of CVE IDs in security advisories. Numerous major OS vendors
37+
Another significant factor to adoption is the ongoing inclusion of CVE IDs in security advisories. Numerous major operating system (OS) vendors
3838
and other organizations from around the world include CVE IDs in their alerts to ensure that the international community benefits
3939
by having the CVE IDs as soon as a problem is announced. In addition, CVE Records are used to uniquely identify vulnerabilities in
4040
public watch lists such as the <a href='https://www.owasp.org/index.php/OWASP_Top_Ten_Project' target="_blank">OWASP Top 10 Web
@@ -124,40 +124,11 @@
124124
<li><a href="https://www.nsa.gov/" target="_blank">National Security Agency (NSA):</a> Tony Sager</li>
125125
<li><a href="https://www.af.mil/" target="_blank">U.S. Air Force:</a> Matt Mleziva</li>
126126
</ul>
127-
<h2 :id="cvenavs['About']['submenu']['History']['items']['CVE Senior Advisory Council (2001-2005)']['anchorId']"
127+
<h2 :id="cvenavs['About']['submenu']['History']['items']['anchorId']"
128128
class="title cve-heading-top-spacing">
129-
{{cvenavs['About']['submenu']['History']['items']['CVE Senior Advisory Council (2001-2005)']['label']}}</h2>
130-
<p>
131-
From 2001 through 2005 the CVE Senior Advisory Council ensured that the CVE Program received the sponsorship
132-
including funding and guidance
133-
required to maximize the effectiveness of the program in supporting government efforts to improve the nation’s ability to
134-
identify and respond
135-
to vulnerabilities and information assurance attacks or issues. The council was composed of senior executives listed
136-
below from within the U.S.
137-
Federal government responsible for information assurance. We thank them for their valuable contributions during that time.
138-
</p>
139-
<h3>Past Advisory Council Members</h3>
140-
<ul>
141-
<li><a href="https://www.af.mil/" target="_blank">U.S. Air Force:</a> John M. Gilligan (Co-Chair)</li>
142-
<li><a href="https://www.dhs.gov/" target="_blank">U.S. Department of Homeland Security:</a> Sallie McDonald (Co-Chair)</li>
143-
<li><a href="https://www.disa.mil/" target="_blank">Defense Information Systems Agency:</a> Richard Hale</li>
144-
<li><a href="https://www.dia.mil/" target="_blank">Defense Intelligence Agency:</a> Mark Morrison</li>
145-
<li><a href="https://www.energy.gov/" target="_blank">Department of Energy:</a> Bruce Brody</li>
146-
<li><a href="https://www.dhs.gov/" target="_blank">Department of Homeland Security (CISO):</a> Robert West</li>
147-
<li><a href="https://www.dhs.gov/" target="_blank">Department of Homeland Security (NCSD):</a> Andy Purdy</li>
148-
<li><a href="https://www.usdoj.gov/">Department of Justice:</a> Vance Hitch</li>
149-
<li><a href="https://www.faa.gov/" target="_blank">Federal Aviation Administration:</a> Greg Dvorak</li>
150-
<li><a href="https://www.fbi.gov/" target="_blank">Federal Bureau of Investigation:</a> Bill Windle</li>
151-
<li><a href="https://www.intelligence.gov/" target="_blank">Intelligence Community:</a> Sherrill Nicely</li>
152-
<li><a href="https://www.mitre.org/" target="_blank">MITRE Corporation:</a> Pete Tasker</li>
153-
<li><a href="https://www.nasa.gov/" target="_blank">National Aeronautics and Space Administration:</a> Michael Castagna</li>
154-
<li><a href="https://www.nist.gov/index.html" target="_blank">National Institute of Standards and Technology:</a> Tim Grance</li>
155-
<li><a href="https://www.nsa.gov/" target="_blank">National Security Agency:</a> Curtis Dukes, Tony Sager</li>
156-
<li><a href="https://www.defense.gov/osd/" target="_blank">OSD/Command, Control, Communications and Intelligence:</a> Bob Lentz</li>
157-
<li><a href="https://www.defense.gov/osd/" target="_blank">OSD/Defense-wide Information Assurance Program:</a> Dana Foat</li>
158-
<li><a href="https://www.defense.gov/osd/" target="_blank">OSD/Networks and Information Integration:</a> Gus Guissanie</li>
159-
<li><a href="https://www.whitehouse.gov/omb/" target="_blank">Office of Management and Budget:</a> Glenn Schlarman</li>
160-
</ul>
129+
{{cvenavs['About']['submenu']['History']['items']['label']}}</h2>
130+
131+
161132
<SurveyLinkComponent :surveyLink="cvenavs['About']['submenu']['History']['surveyLink']" />
162133
</div>
163134
</main>

‎src/views/About/Overview.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div class="cve-white-bg-gray-border-container">
2626
<h3 class="title mt-4">CVE Program Overview</h3>
2727
<figure class ="image is-16by9"> <!-- youtube video -->
28-
<iframe class="has-ratio" width="560" height="315" src="https://www.youtube.com/embed/lkWUJXNu0kQ" frameborder="0"
28+
<iframe class="has-ratio" width="560" height="315" src="https://www.youtube.com/embed/rrNYEUNsXOY" frameborder="0"
2929
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
3030
</iframe>
3131
</figure>
@@ -43,7 +43,7 @@
4343
<p>
4444
Episode 1 - Tod Beardsley of Rapid7, Tom Millar of CISA, Chris Levendis of the CVE Program, and Dave Waltermire of NIST's NVD discuss
4545
how their organizations and the community all work together to advance the CVE Program’s mission to identify, define, and catalog
46-
publicly disclosed.
46+
publicly disclosed cybersecurity vulnerabilities.
4747
</p>
4848
</div>
4949
<SurveyLinkComponent :surveyLink="cvenavs['About']['submenu']['Overview']['surveyLink']" />

‎src/views/Downloads.vue‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -122,29 +122,29 @@
122122
XML Files By Year:
123123
</p>
124124
<ul class="mt-0 tile-body cve-task-tile-list cve-list-no-bullet">
125-
<li><a href="/data/downloads/allitems-cvrf-year-2021.xml">CVE-2021-xxxxxx records</a></li>
126-
<li><a href="/data/downloads/allitems-cvrf-year-2020.xml">CVE-2020-xxxxxx records</a></li>
127-
<li><a href="/data/downloads/allitems-cvrf-year-2019.xml">CVE-2019-xxxxxx records</a></li>
128-
<li><a href="/data/downloads/allitems-cvrf-year-2018.xml">CVE-2018-xxxxxx records</a></li>
129-
<li><a href="/data/downloads/allitems-cvrf-year-2017.xml">CVE-2017-xxxxxx records</a></li>
130-
<li><a href="/data/downloads/allitems-cvrf-year-2016.xml">CVE-2016-xxxxxx records</a></li>
131-
<li><a href="/data/downloads/allitems-cvrf-year-2015.xml">CVE-2015-xxxxxx records</a></li>
132-
<li><a href="/data/downloads/allitems-cvrf-year-2014.xml">CVE-2014-xxxx records</a></li>
133-
<li><a href="/data/downloads/allitems-cvrf-year-2013.xml">CVE-2013-xxxx records</a></li>
134-
<li><a href="/data/downloads/allitems-cvrf-year-2012.xml">CVE-2012-xxxx records</a></li>
135-
<li><a href="/data/downloads/allitems-cvrf-year-2011.xml">CVE-2011-xxxx records</a></li>
136-
<li><a href="/data/downloads/allitems-cvrf-year-2010.xml">CVE-2010-xxxx records</a></li>
137-
<li><a href="/data/downloads/allitems-cvrf-year-2009.xml">CVE-2009-xxxx records</a></li>
138-
<li><a href="/data/downloads/allitems-cvrf-year-2008.xml">CVE-2008-xxxx records</a></li>
139-
<li><a href="/data/downloads/allitems-cvrf-year-2007.xml">CVE-2007-xxxx records</a></li>
140-
<li><a href="/data/downloads/allitems-cvrf-year-2006.xml">CVE-2006-xxxx records</a></li>
141-
<li><a href="/data/downloads/allitems-cvrf-year-2005.xml">CVE-2005-xxxx records</a></li>
142-
<li><a href="/data/downloads/allitems-cvrf-year-2004.xml">CVE-2004-xxxx records</a></li>
143-
<li><a href="/data/downloads/allitems-cvrf-year-2003.xml">CVE-2003-xxxx records</a></li>
144-
<li><a href="/data/downloads/allitems-cvrf-year-2002.xml">CVE-2002-xxxx records</a></li>
145-
<li><a href="/data/downloads/allitems-cvrf-year-2001.xml">CVE-2001-xxxx records</a></li>
146-
<li><a href="/data/downloads/allitems-cvrf-year-2000.xml">CVE-2000-xxxx records</a></li>
147-
<li><a href="/data/downloads/allitems-cvrf-year-1999.xml">CVE-1999-xxxx records</a></li>
125+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2021.xml">CVE-2021-xxxxxx records</a></li>
126+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2020.xml">CVE-2020-xxxxxx records</a></li>
127+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2019.xml">CVE-2019-xxxxxx records</a></li>
128+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2018.xml">CVE-2018-xxxxxx records</a></li>
129+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2017.xml">CVE-2017-xxxxxx records</a></li>
130+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2016.xml">CVE-2016-xxxxxx records</a></li>
131+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2015.xml">CVE-2015-xxxxxx records</a></li>
132+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2014.xml">CVE-2014-xxxx records</a></li>
133+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2013.xml">CVE-2013-xxxx records</a></li>
134+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2012.xml">CVE-2012-xxxx records</a></li>
135+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2011.xml">CVE-2011-xxxx records</a></li>
136+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2010.xml">CVE-2010-xxxx records</a></li>
137+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2009.xml">CVE-2009-xxxx records</a></li>
138+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2008.xml">CVE-2008-xxxx records</a></li>
139+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2007.xml">CVE-2007-xxxx records</a></li>
140+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2006.xml">CVE-2006-xxxx records</a></li>
141+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2005.xml">CVE-2005-xxxx records</a></li>
142+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2004.xml">CVE-2004-xxxx records</a></li>
143+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2003.xml">CVE-2003-xxxx records</a></li>
144+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2002.xml">CVE-2002-xxxx records</a></li>
145+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2001.xml">CVE-2001-xxxx records</a></li>
146+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-2000.xml">CVE-2000-xxxx records</a></li>
147+
<li><a href="https://cve.mitre.org/data/downloads/allitems-cvrf-year-1999.xml">CVE-1999-xxxx records</a></li>
148148
</ul>
149149
</article>
150150
</div>

0 commit comments

Comments
 (0)