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.

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

Gsa/staging/prod release #398

Merged
merged 159 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
e0bd316
update readme to point developers to cloud.gov documentation
mark-meyer Oct 11, 2023
81d8c67
caps for Pages
mark-meyer Oct 11, 2023
0714970
Adding nvm file for node version
eric-gade Oct 11, 2023
9bc3a3c
Merge pull request #361 from GSA/mmeyer/update-readme-cloud-gov-info
mark-meyer Oct 17, 2023
a9a50bb
Merge pull request #362 from GSA/eric-review
mark-meyer Oct 17, 2023
29deb6a
Update index.mdx
rebekahperillo Oct 20, 2023
7abec72
Update index.mdx
rebekahperillo Oct 20, 2023
008131c
Update index.mdx
rebekahperillo Oct 20, 2023
957e75c
Update index.mdx
rebekahperillo Oct 20, 2023
dbe0d34
Update index.mdx
rebekahperillo Oct 20, 2023
458118a
Update index.md
rebekahperillo Oct 20, 2023
b0aeb83
Update index.md
rebekahperillo Oct 20, 2023
ec910fd
Update master-contract.md
rebekahperillo Oct 20, 2023
0cd5f7d
Update strategic-payment-solutions.md
rebekahperillo Oct 20, 2023
651c735
Update refunds.md
rebekahperillo Oct 20, 2023
65afa17
Update refunds.md
rebekahperillo Oct 20, 2023
a39bf61
Update refunds.md
rebekahperillo Oct 20, 2023
d044ec8
Update account-holders.md
rebekahperillo Oct 20, 2023
1f5d33d
Update program-coordinators.md
rebekahperillo Oct 20, 2023
2c0de1f
Update logos.mdx
rebekahperillo Oct 20, 2023
a3df12d
Update benefits.md
rebekahperillo Oct 20, 2023
f8589bc
Update audits.md
rebekahperillo Oct 20, 2023
ad7910e
Update section-889.md
rebekahperillo Oct 20, 2023
3a90d08
Update section-889.md
rebekahperillo Oct 21, 2023
9129b6a
Update section-889.md
rebekahperillo Oct 21, 2023
2b0ff3e
Update section-889.md
rebekahperillo Oct 21, 2023
03f4344
Update smart-bulletins.yaml
rebekahperillo Oct 21, 2023
3622dc1
Update statistics.md
rebekahperillo Oct 21, 2023
2d3c8ed
Update publications.md
rebekahperillo Oct 21, 2023
0a827db
Update publications.md
rebekahperillo Oct 21, 2023
018554b
Update events.md
rebekahperillo Oct 21, 2023
41331a3
Update publications.md
rebekahperillo Oct 21, 2023
26e626e
Update events.md
rebekahperillo Oct 21, 2023
6741cbd
Update logos.mdx
rebekahperillo Oct 21, 2023
846a7ee
Update logos.mdx
rebekahperillo Oct 21, 2023
e73e604
Update refunds.md
rebekahperillo Oct 21, 2023
0877685
Update index.md
rebekahperillo Oct 21, 2023
6dec280
Update index.md
rebekahperillo Oct 21, 2023
b7ff008
Update index.md
rebekahperillo Oct 21, 2023
fd898b9
Update account-holders.md
rebekahperillo Oct 21, 2023
fbc2bd5
Update index.md
rebekahperillo Oct 21, 2023
ea36617
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
1618d9a
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
dee749f
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
909635b
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
647523d
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
41a06cb
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
c2372a6
Update recognizing-your-account.mdx
rebekahperillo Oct 21, 2023
8a04da8
Delete public/files/stats-tool.xlsx
rebekahperillo Oct 24, 2023
118171c
Add files via upload
rebekahperillo Oct 24, 2023
57df1ed
Update statistics.md
rebekahperillo Oct 24, 2023
1b39323
Update statistics.md
rebekahperillo Oct 24, 2023
0b7f85e
Updated USWDS version from 3.5.0 to 3.6.1
felder101 Oct 25, 2023
319db15
Merge pull request #372 from GSA/technical/issue-430/update_uswds_ver…
felder101 Nov 3, 2023
f08d0a8
Delete public/files/stats-tool.xlsx
rebekahperillo Nov 17, 2023
01f8a00
Add files via upload
rebekahperillo Nov 17, 2023
67beae7
Update statistics.md
rebekahperillo Nov 17, 2023
e451de6
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
ab6c09c
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
bf137be
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
f7a7022
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
06c359f
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
d6f770f
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
0a0eb90
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
9455675
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
98614f2
Update master-contract.md
rebekahperillo Nov 24, 2023
b5685a4
Update program-coordinators.md
rebekahperillo Nov 24, 2023
470cfb6
Update state-tax-forms.mdx
rebekahperillo Nov 24, 2023
bac7605
Update state-tax-forms.mdx
rebekahperillo Nov 24, 2023
920300c
Update index.md
rebekahperillo Nov 24, 2023
f5e64d7
Update index.md
rebekahperillo Nov 24, 2023
e6d5ec3
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
88166c7
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
dbb6377
Update legal-history.mdx
rebekahperillo Nov 24, 2023
708f1ce
Update publications.md
rebekahperillo Nov 24, 2023
ad465d1
Update publications.md
rebekahperillo Nov 24, 2023
87df771
Update events.md
rebekahperillo Nov 24, 2023
8b59592
Create FASCSA-Order-Check.md
rebekahperillo Nov 24, 2023
c374700
Update menu.yaml
rebekahperillo Nov 24, 2023
a64f29b
Update FASCSA-Order-Check.md
rebekahperillo Nov 24, 2023
bea08fd
Update FASCSA-Order-Check.md
rebekahperillo Nov 24, 2023
e0aceb1
Update FASCSA-Order-Check.md
rebekahperillo Nov 24, 2023
bb794cb
Update menu.yaml
rebekahperillo Nov 24, 2023
e054a73
Update menu.yaml
rebekahperillo Nov 24, 2023
da7675f
Update menu.yaml
rebekahperillo Nov 24, 2023
3e0761c
Rename FASCSA-Order-Check.md to FASCSA-order-check.md
rebekahperillo Nov 24, 2023
f7c4d39
Update menu.yaml
rebekahperillo Nov 24, 2023
cce6014
Update section-889.md
rebekahperillo Nov 24, 2023
b52c3a7
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
f479f73
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
92f8801
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
21d34c9
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
1413304
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
01f8f10
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
6ba5d2d
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
62849ff
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
d6b16a0
Update recognizing-your-account.mdx
rebekahperillo Nov 24, 2023
34877a1
Update recognizing-your-account.mdx
rebekahperillo Nov 28, 2023
9eae282
Update recognizing-your-account.mdx
rebekahperillo Nov 28, 2023
12d05d7
Update recognizing-your-account.mdx
rebekahperillo Nov 28, 2023
12ede2a
Update recognizing-your-account.mdx
rebekahperillo Nov 28, 2023
b74257c
Update recognizing-your-account.mdx
rebekahperillo Nov 28, 2023
6fb03f8
Update arizona.md
rebekahperillo Nov 28, 2023
04399f8
Update FASCSA-order-check.md
rebekahperillo Nov 29, 2023
04f6175
Update strategic-payment-solutions.md
rebekahperillo Nov 29, 2023
344b4db
Update eligibility.md
rebekahperillo Nov 29, 2023
b20cc0e
Update account-holders.md
rebekahperillo Nov 29, 2023
5394134
Update eligibility.md
rebekahperillo Nov 29, 2023
64cb1f0
Update events.md
rebekahperillo Nov 29, 2023
058931c
Update recognizing-your-account.mdx
rebekahperillo Nov 29, 2023
94d154f
Update all-business-lines.mdx
rebekahperillo Nov 29, 2023
62e65a1
Update fleet.mdx
rebekahperillo Nov 29, 2023
e460fd6
Update purchase.mdx
rebekahperillo Nov 29, 2023
9f8f6bd
Update travel.mdx
rebekahperillo Nov 29, 2023
62262e4
Update state-tax-forms.mdx
rebekahperillo Nov 29, 2023
a360ac5
Update legal-history.mdx
rebekahperillo Nov 29, 2023
8c5af66
Update section-889.md
rebekahperillo Nov 29, 2023
0d58ade
Update FASCSA-order-check.md
rebekahperillo Nov 29, 2023
bbbfab7
Update FASCSA-order-check.md
rebekahperillo Nov 29, 2023
575b3f4
Update recognizing-your-account.mdx
rebekahperillo Nov 29, 2023
ff3278d
Merge pull request #371 from GSA/rebekah102023
rebekahperillo Nov 29, 2023
48fd4d2
Update Callout.astro
rebekahperillo Nov 29, 2023
ce4aff8
Merge pull request #377 from GSA/rebekah112923
felder101 Nov 29, 2023
644ab7b
Merge pull request #376 from GSA/rebekah102023v2
felder101 Nov 29, 2023
550cfff
Update faq.mdx
rebekahperillo Nov 29, 2023
0b55bab
Update faq.mdx
rebekahperillo Nov 29, 2023
6b139e2
Update faq.mdx
rebekahperillo Nov 29, 2023
6de4995
Update customer-support.mdx
rebekahperillo Nov 29, 2023
9e2c8d9
Update customer-support.mdx
rebekahperillo Nov 29, 2023
81e4e78
Update banks-contact.mdx
rebekahperillo Nov 29, 2023
61bec1c
Update customer-support.mdx
rebekahperillo Nov 29, 2023
6f40939
Update banks-contact.mdx
rebekahperillo Nov 29, 2023
671949c
Update faq.mdx
rebekahperillo Nov 29, 2023
f260a35
Update customer-support.mdx
rebekahperillo Nov 29, 2023
7cf44b9
Update customer-support.mdx
rebekahperillo Nov 29, 2023
00ff5b7
Update banks-contact.mdx
rebekahperillo Nov 29, 2023
ecf4f83
Update customer-support.mdx
rebekahperillo Nov 29, 2023
89c5bf0
Update customer-support.mdx
rebekahperillo Nov 29, 2023
e8eb70a
Delete public/files/publications/publications-smartpay-strategic-paym…
rebekahperillo Nov 29, 2023
0ce7546
Add files via upload
rebekahperillo Nov 29, 2023
ba3437d
Delete public/files/publications/smartpay-strategic-payment-solution.pdf
rebekahperillo Nov 29, 2023
c1acfe3
Add files via upload
rebekahperillo Nov 29, 2023
b79e854
Update faq.mdx
rebekahperillo Nov 29, 2023
4c299ec
Update customer-support.mdx
rebekahperillo Nov 29, 2023
9ff9501
Update customer-support.mdx
rebekahperillo Nov 29, 2023
59a7525
Update customer-support.mdx
rebekahperillo Nov 29, 2023
43a395d
Update business-lines.mdx
rebekahperillo Nov 29, 2023
49fcedd
Update business-lines.mdx
rebekahperillo Nov 29, 2023
28944a9
Update business-lines.mdx
rebekahperillo Nov 29, 2023
4b3a0ad
Update customer-support.mdx
rebekahperillo Nov 29, 2023
2df3263
Update customer-support.mdx
rebekahperillo Nov 29, 2023
c03d237
Merge pull request #379 from GSA/rebekah112923v2
rebekahperillo Nov 29, 2023
15cda4d
Addressed Code Review comments for Production Release
felder101 Nov 30, 2023
1f40ce8
Merge pull request #384 from GSA/bugfixes/code-review-release-comments
felder101 Nov 30, 2023
b2df5fd
Addressed code review comments.
felder101 Nov 30, 2023
5ba47c8
Merge pull request #385 from GSA/bugfixes/review-comments-v2
felder101 Nov 30, 2023
15fa6e5
Feature/issue 396/american drone act text (#397)
felder101 Jan 4, 2024
9d80fd0
Merging staging into Main.
felder101 Jan 4, 2024
b6db41f
Updated link on the American Security Drone Act to indicate external …
felder101 Jan 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/content/nav/menu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
href: resources/tools/section-889
- title: FASCSA Order Check
href: resources/tools/fascsa-order-check
- title: American Security Drone Act of 2023
href: resources/tools/american-security-drone-act
- title: Publications and Videos
href: resources/publications
- title: Events
Expand Down
2 changes: 1 addition & 1 deletion src/content/resources/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Events
description: Stay aware of upcoming GSA SmartPay events like training forums, summits, conferences, and fairs.
intro: Join us at in-person and virtual events to learn more about the GSA SmartPay® program.
order: 4
order: 5
---

## GSA SmartPay Training Forum
Expand Down
2 changes: 1 addition & 1 deletion src/content/resources/publications.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Publications and Videos
description: Learn more with resources for account holders. We have guides, presentations and publications specific to travel, purchase, fleet and more.
intro: Learn more about the GSA SmartPay® program by reviewing these resources for various stakeholders.
order: 3
order: 4
---

## Travel Publications
Expand Down
36 changes: 36 additions & 0 deletions src/content/resources/tools/american-security-drone-act.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
title: American Security Drone Act Of 2023
description: American Security Drone Act Of 2023
order: 3
---

<p class="usa-intro"> On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024](https://www.congress.gov/bill/118th-congress/house-bill/2670) (NDAA).</p>

As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.

**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
<ul class="usa-list">
<li>The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:</li>
<ol type="A" class="usa-list">
<li>An entity included on the Consolidated Screening List.</li>
<li>Any entity that is subject to extrajudicial direction from a foreign government
as determined by the Secretary of Homeland Security.</li>
<li>Any entity the Secretary of Homeland Security, in coordination with the
Attorney General, Director of National Intelligence, and the Secretary of
Defense, determines poses a national security risk.</li>
<li>Any entity domiciled in the People’s Republic of China or subject to influence
or control by the Government of the People’s Republic of China or the
Communist Party of the People’s Republic of China, as determined by the
Secretary of Homeland Security.</li>
<li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
</ol>
<li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
</ul>

**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.

## Cleared Drone Vendors
- A cleared list of drone vendors is available from the Defense Innovation Unit.
- https://www.diu.mil/blue-uas-cleared-list