Skip to content

Commit 65f5090

Browse files
authored
Merge branch 'RealityBending:main' into interoception-blog
2 parents 0848af9 + 46daefd commit 65f5090

645 files changed

Lines changed: 30912 additions & 8785 deletions

File tree

Some content is hidden

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

.Rprofile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ options(
2020
)
2121

2222
# fix Hugo version
23-
# options(blogdown.hugo.version = "0.134.0")
23+
# options(blogdown.hugo.version = "0.150.0")

.github/workflows/check.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
run: Rscript -e 'install.packages(c("rmarkdown","blogdown", "remotes"))'
2626

2727
- name: Install hugo
28-
run: Rscript -e 'blogdown::install_hugo(version="0.152.2")' # Latest is currently broken
28+
run: Rscript -e 'blogdown::install_hugo("0.150.0")' # Latest is currently broken
2929

3030
- name: Build site with blogdown
31-
run: Rscript -e "blogdown::build_site()"
32-
31+
run: Rscript -e 'tryCatch(blogdown::build_site(), error = function(e) { message(e); quit(status = 1) })'

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
run: Rscript -e 'install.packages(c("rmarkdown","blogdown", "remotes"))'
2626

2727
- name: Install hugo
28-
run: Rscript -e 'blogdown::install_hugo(version="0.152.2")' # Latest is currently broken
28+
run: Rscript -e 'blogdown::install_hugo("0.150.0")' # Latest is currently broken
2929

3030
- name: Build site with blogdown
31-
run: Rscript -e "blogdown::build_site()"
31+
run: Rscript -e 'tryCatch(blogdown::build_site(), error = function(e) { message(e); quit(status = 1) })'
3232

3333
- name: Deploy 🚀
3434
uses: peaceiris/actions-gh-pages@v3

content/authors/Anshu-Te/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ social:
2525
- icon: envelope
2626
icon_pack: fas
2727
link: mailto:anshu.te@ntu.edu.sg
28-
- icon: twitter
28+
- icon: x-twitter
2929
icon_pack: fab
30-
link: https://twitter.com/anshu_te97
30+
link: https://x.com/anshu_te97
3131
- icon: researchgate
3232
icon_pack: fab
3333
link: https://www.researchgate.net/profile/An_Shu_Te

content/authors/aang/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
authors:
33
- Aang
44
bio: "Co-founder of the United Republic of Nations and Fully Realized Avatar."
5-
education: ""
65
email: ""
76
interests:
87
- Appa

content/authors/annabel-chen/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ social:
2121
- icon: envelope
2222
icon_pack: fas
2323
link: mailto:your@annabelchen@ntu.edu.sg
24-
- icon: twitter
24+
- icon: x-twitter
2525
icon_pack: fab
26-
link: https://twitter.com/DrAnnabelChen
26+
link: https://x.com/DrAnnabelChen
2727
- icon: google-scholar
2828
icon_pack: ai
2929
link: https://scholar.google.com/citations?user=kMqbNZYAAAAJ&hl=en&oi=ao

content/authors/dominique-makowski/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ social:
4747
- icon: envelope
4848
icon_pack: fas
4949
link: '#contact'
50-
- icon: twitter
50+
- icon: x-twitter
5151
icon_pack: fab
52-
link: https://twitter.com/Dom_Makowski
52+
link: https://x.com/Dom_Makowski
5353
- icon: google-scholar
5454
icon_pack: ai
5555
link: https://scholar.google.fr/citations?user=bg0BZ-QAAAAJ&hl=en

content/authors/dr-strange/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
authors:
33
- dr-strange
44
bio: "Faith is my sword. Truth my shield. Knowledge my armor."
5-
education: ""
65
email: ""
76
interests:
87
- Bargaining

content/authors/emma-benn/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ social:
1313
- icon: envelope
1414
icon_pack: fas
1515
link: mailto:eb672@sussex.ac.uk
16-
- icon: twitter
16+
- icon: x-twitter
1717
icon_pack: fab
1818
link: https://x.com/EmmaLBenn
1919
- icon: researchgate

content/authors/eva_aktar/_index.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)