Skip to content

Commit

Permalink
Merge branch 'main' into source
Browse files Browse the repository at this point in the history
  • Loading branch information
rain305f committed Aug 23, 2024
2 parents 5d7cf89 + 4b49c5d commit 59d3384
Show file tree
Hide file tree
Showing 57 changed files with 1,473 additions and 159 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# USC Lira Lab
USC Lira Lab's website, hosted on GitHub Pages!
SaFoLab's website, hosted on GitHub Pages!

## Developing the Website
To develop, **you must do your work on the `source` branch**. `main` is autogenerated via a `rake` job (you can see the details in `Rakefile`). The `source` branch contains all the Jekyll code. To do this, simply execute
Expand All @@ -17,6 +17,5 @@ If you want commit with a custom commit message, do:
rake publish["custom commit message\, and this is how to use a comma"]
```

This will rebuild the site, commit your changes to the `source` branch, and deploy the generated site to the `main` branch. GitHub Pages will pick up on this change and update `usc-lira.github.io` with the new changes.

**NOTE**: This GitHub Pages link is the where the `liralab.usc.edu` proxies point to, so this repository and the corresponding GitHub Page is the "actual" website.

2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ people_buttons:
github: 'fab fa-github'
twitter: 'fab fa-twitter'
cv: 'ai ai-cv-square'
thesis: 'fa fa-book'
thesis: 'fa fa-book'
2 changes: 1 addition & 1 deletion _data/people.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- name: Chaowei Xiao
picture: /images/people/chaoweixiao.jpg
home_url: https://xiaocw11.github.io
description: He is an assistant professor at the University of Wisconsin, Madison, and also a research scientist at NVIDIA.
description: Chaowei is an assistant professor at the University of Wisconsin, Madison, and also a research scientist at NVIDIA.
rank: faculty
links:
- type: scholar
Expand Down
Loading

0 comments on commit 59d3384

Please sign in to comment.