Skip to content
This repository was archived by the owner on Nov 10, 2020. It is now read-only.

dev-->master #5065

Merged
merged 41 commits into from
Jun 17, 2020
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b1c49d7
updates may 2020 monthly file
Maroyafaied Jun 9, 2020
ed2a231
add Feb 2020 data
Maroyafaied Jun 9, 2020
0ea8f20
removes 0
Maroyafaied Jun 9, 2020
d6cb633
fixes Lake County
Maroyafaied Jun 10, 2020
73ceaef
update files
Maroyafaied Jun 10, 2020
07b3be3
Merge pull request #5060 from ONRR/monthly-file-update
jennmalcolm Jun 10, 2020
f4dcca0
updates csv files
Maroyafaied Jun 10, 2020
cad3c60
Merge pull request #5061 from ONRR/production-monthly-update
jennmalcolm Jun 10, 2020
65b17a0
Merge pull request #5063 from ONRR/update-revenue-files
jennmalcolm Jun 10, 2020
d039337
change file references for downloads
jennmalcolm Jun 10, 2020
0cca10c
adding new files
jennmalcolm Jun 10, 2020
9cf55c7
update file details
jennmalcolm Jun 10, 2020
d82db2e
Merge pull request #5064 from ONRR/Update-CY-prod
jennmalcolm Jun 16, 2020
5f12bd0
increment version
jennmalcolm Jun 16, 2020
e35d511
update what's new
jennmalcolm Jun 16, 2020
924f2b1
Adds shaping blog post
mcharg Jun 16, 2020
7a7611c
Fixes links to Basecamp
mcharg Jun 16, 2020
6bd9fa8
Fixes Basecamp link
mcharg Jun 16, 2020
635e16c
change blog link and description
jennmalcolm Jun 16, 2020
4446b6b
fix typo
jennmalcolm Jun 16, 2020
5254138
testing new copy of image
jennmalcolm Jun 16, 2020
4d6ce53
Merge branch 'shaping-blog' of https://github.com/ONRR/doi-extractive…
jennmalcolm Jun 16, 2020
979e3b3
Revert "testing new copy of image"
jennmalcolm Jun 16, 2020
12edb2f
Revert "fix typo"
jennmalcolm Jun 16, 2020
dfd2155
Revert "Revert "fix typo""
jennmalcolm Jun 16, 2020
17aa99b
Revert "Revert "testing new copy of image""
jennmalcolm Jun 16, 2020
2de2eaf
working on basecamp links
jennmalcolm Jun 16, 2020
ba66a79
testing html link, a few other changes to text
jennmalcolm Jun 16, 2020
e750677
more html
jennmalcolm Jun 16, 2020
08a9db9
add missing quote
jennmalcolm Jun 16, 2020
136d2b5
testing links
jennmalcolm Jun 16, 2020
1226200
adding 2 images
jennmalcolm Jun 16, 2020
895d254
testing 1 image
jennmalcolm Jun 16, 2020
d636803
testing 2 images
jennmalcolm Jun 16, 2020
01f0a0c
testing image limit
jennmalcolm Jun 16, 2020
17bff24
put image back
jennmalcolm Jun 16, 2020
6baa255
deleted image not working
jennmalcolm Jun 16, 2020
0cfb2b1
Merge pull request #5067 from ONRR/release-changes-6.0.1
jennmalcolm Jun 16, 2020
d0dd8c6
Attempts to fix images
mcharg Jun 17, 2020
45e36b2
Removes last image again
mcharg Jun 17, 2020
59ee722
Merge pull request #5066 from ONRR/shaping-blog
mcharg Jun 17, 2020
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
Prev Previous commit
Next Next commit
testing 1 image
  • Loading branch information
jennmalcolm committed Jun 16, 2020
commit 895d25475fc3bcdfff79f5b7472355abdeeebb69
2 changes: 0 additions & 2 deletions blog-site/src/pages/shaping/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ One of the tasks we put off until after the soft launch was working on the searc
## Final deliverable

We released the <a href="https://beta-nrrd.app.cloud.gov/">soft launch</a> a couple of weeks ago and are diligently working through all the things we need to do to be ready for the hard launch.
<img alt="Image of new features including map, circle charts, and line chart in beta site" src="beta-site.png">
<img alt="Image of new map from beta site" src="beta-map.png">

![Image showing detailed cards with circle charts from beta site](./beta-cards.png)

Expand Down