Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ See a list of [open issues](https://github.com/code4lib/2019.code4lib.org/issues

### Contributing

1. Make sure you're on the master branch
* ```git checkout master```
2. Make sure your master branch is up to date
* ```git pull origin master```
1. Make sure you're on the main branch
* ```git checkout main```
2. Make sure your main branch is up to date
* ```git pull origin main```
3. Start up jekyll
* ```bundle exec jekyll serve```
* open [http://localhost:4000](http://localhost:4000) in your browser
Expand All @@ -45,10 +45,10 @@ See a list of [open issues](https://github.com/code4lib/2019.code4lib.org/issues
* ```git commit -m "fixes issue #3"```
8. Add your branch to the repo
* ```git push --set-upstream origin issue#3```
9. Switch back to the master branch
* ```git checkout master```
9. Switch back to the main branch
* ```git checkout main```
10. Go to https://github.com/code4lib/2019.code4lib.org
11. Make a pull request base:master and compare:issue-3
11. Make a pull request base:main and compare:issue-3
12. Wait for someone to test your changes and merge the pull request
13. Do the dance of joy

Expand All @@ -61,7 +61,7 @@ See a list of [open issues](https://github.com/code4lib/2019.code4lib.org/issues
* ```git checkout BRANCHNAME```
4. ```bundle exec jekyll serve```
5. Check [http://localhost:4000](http://localhost:4000) that nothing is broken
6. Merge that branch into master (easiest to manage on the GitHub site)
6. Merge that branch into main (easiest to manage on the GitHub site)

## Dat

Expand Down
10 changes: 5 additions & 5 deletions _data/speakers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -425,16 +425,16 @@
image_src: /assets/img/speakers/kauffman_rhonda.jpg
keynote: false

- id: tim-walsh
name: Tim Walsh
- id: tessa-walsh
name: Tessa Walsh
last: Walsh
title: Digital Preservation Librarian
institution: Concordia University
bio: "Tim Walsh is a librarian, digital preservationist, and software developer employed as the Digital Preservation Librarian at Concordia University Library in Montreal, Canada. He is the developer of several open-source digital preservation utilities, including Brunnhilde, a reporting tool for disk images and directories of files, and Bulk Reviewer, an application for identifying and managing sensitive and confidential information in digital archives."
bio: "Tessa Walsh is a librarian, digital preservationist, and software developer employed as the Digital Preservation Librarian at Concordia University Library in Montreal, Canada. She is the developer of several open-source digital preservation utilities, including Brunnhilde, a reporting tool for disk images and directories of files, and Bulk Reviewer, an application for identifying and managing sensitive and confidential information in digital archives."
twitter_handle: bitarchivist
slack_handle:
github_handle: timothyryanwalsh
image_src: /assets/img/speakers/walsh_tim.png
github_handle: tw4l
image_src: /assets/img/speakers/walsh_tessa.png
keynote: false

- id: ilya-kreymer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ type: talk
categories: talks
time: 13:45
startTime: 1550688300
speakers-text: Tim Walsh
speakers-text: Tessa Walsh
speakers:
- tim-walsh
- tessa-walsh
slides:
title: Building REST API-backed Single Page Applications (SPAs) with Vue.js
---
Expand Down
Binary file added assets/img/speakers/walsh_tessa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/img/speakers/walsh_tim.png
Binary file not shown.