Skip to content

Commit e449f24

Browse files
authored
Merge branch 'dev' into ptothej23-patch-1
2 parents 36e8fab + e1c9563 commit e449f24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+316
-282
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# default owners for anything not listed below
2-
* @nmdefries @melange396 @carlynvandyke
2+
* @nmdefries @melange396 @carlynvandyke @biganemone

.github/workflows/blog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
Rscript ./dependencies.R
3131
- name: Restore Blogdown Cache
32-
uses: actions/cache@v4.2.2
32+
uses: actions/cache@v4
3333
with:
3434
path: |
3535
./blogdown

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/setup-node@v4
1515
with:
1616
node-version: 18
17-
- uses: actions/cache@v4.2.2
17+
- uses: actions/cache@v4
1818
with:
1919
path: ~/.npm
2020
key: ${{ runner.os }}-node3-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
node-version: 18
4949
- name: Cache Node.js modules
50-
uses: actions/cache@v4.2.2
50+
uses: actions/cache@v4
5151
with:
5252
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
5353
key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}

config.toml

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,14 @@ relativeURLs = false
2828
weight = 2
2929
[[menu.main]]
3030
parent = "about"
31-
name = "Delphi Milestones"
32-
url = "/about/milestones"
33-
weight = 3
34-
[[menu.main]]
35-
parent = "about"
36-
name = "Publications"
37-
url = "/about/publications"
31+
name = "Research"
32+
url = "/about/research"
3833
weight = 4
3934
[[menu.main]]
4035
parent = "about"
4136
name = "Blog"
4237
url = "/blog"
4338
weight = 5
44-
[[menu.main]]
45-
parent = "about"
46-
name = "News"
47-
url = "/about/news"
48-
weight = 6
4939
[[menu.main]]
5040
parent = "about"
5141
name = "Join Us"
@@ -99,37 +89,37 @@ relativeURLs = false
9989
weight = 2
10090
[[menu.main]]
10191
parent = "epidemic-signals"
102-
name = "Indicator Discovery & Selection"
92+
name = "Indicator Discovery (EpiPortal)"
10393
url = "/epiportal/"
10494
weight = 3
10595
[menu.main.params]
10696
external = true
10797
[[menu.main]]
10898
parent = "epidemic-signals"
109-
name = "Indicator Visualization"
110-
url = ""
99+
name = "Indicator Visualization (EpiVis)"
100+
url = "/epivis/"
111101
identifier = "signal-visualization"
112102
weight = 4
113-
[[menu.main]]
114-
parent = "signal-visualization"
115-
name = "EpiVis"
116-
url = "/epivis/"
117-
weight = 10
118-
[[menu.main]]
119-
parent = "signal-visualization"
120-
name = "Delphi Epidata Dashboard"
121-
url = "/covidcast/"
122-
weight = 20
123-
[[menu.main]]
124-
parent = "signal-visualization"
125-
name = "Covidcast 1.0 (“Classic”)"
126-
url = "/covidcast/classic/"
127-
weight = 30
128-
[[menu.main]]
129-
parent = "signal-visualization"
130-
name = "Dashboard Builder"
131-
url = "/covidcast/dashboard/"
132-
weight = 40
103+
# [[menu.main]]
104+
# parent = "signal-visualization"
105+
# name = "EpiVis"
106+
# url = "/epivis/"
107+
# weight = 10
108+
# [[menu.main]]
109+
# parent = "signal-visualization"
110+
# name = "Delphi Epidata Dashboard"
111+
# url = "/covidcast/"
112+
# weight = 20
113+
# [[menu.main]]
114+
# parent = "signal-visualization"
115+
# name = "Covidcast 1.0 (“Classic”)"
116+
# url = "/covidcast/classic/"
117+
# weight = 30
118+
# [[menu.main]]
119+
# parent = "signal-visualization"
120+
# name = "Dashboard Builder"
121+
# url = "/covidcast/dashboard/"
122+
# weight = 40
133123
[[menu.main]]
134124
parent = "epidemic-signals"
135125
name = "Indicator Download"

content/about/_index.md

Lines changed: 3 additions & 3 deletions

content/about/milestones/index.md

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)