Skip to content

Commit

Permalink
fix broken links, upd my info
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehvix committed Apr 3, 2022
1 parent 31eb380 commit 47913b4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
8 changes: 5 additions & 3 deletions _staffers/max.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
name: Max Vogel
role: Facilitator
email: max[email protected]
website: www.mehvix.com
photo: max.png
email: max@mehvix.com
website: https://www.mehvix.com
photo: vogel.png
---

Never not experimenting.
2 changes: 1 addition & 1 deletion _staffers/zsample.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Vacuum Cleaner
role: Facilitator
email: [email protected]
website: https://google.com
website: https://google.com # should start with https://
photo: kevin.jpg
---

Expand Down
Binary file removed assets/images/max.png
Binary file not shown.
Binary file added assets/images/vogel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions labs/s1.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Even if you're feeling the slightest bit unsure about something, or if you're cu
If you want to ask someone about something, or just want to say hi, here's a list of some veteran staff members and what they do. **If you'd like to add yourself to this list, make a PR to decal-web and/or ping @bencuan!**

General Managers (GMs): oversee the administrative side of the OCF, including BoD meetings. Ask them about hosting staff hours, contributing non-technically, and joining the Board of Directors!
* Ben Cuan (bencuan)
* Ben Cuan (bencuan)
* Justin Zhang (jyxzhang)

Site Managers (SMs): oversee the technical side of the OCF, including the lab space. Ask them about OCF infrastructure, technical projects, and upcoming lab upgrades!
Expand All @@ -55,7 +55,7 @@ Site Managers (SMs): oversee the technical side of the OCF, including the lab sp
Operations Managers (OMs): oversee the OCF's operations staff (opstaff), who run the front desk and many other lab operations, including technical and design projects.
* Amy Oh (amyoh)

Internal Committee (#internal-comm): manages staff events, socials, and meetings.
Internal Committee (#internal-comm): manages staff events, socials, and meetings.
* Kian Sutarwala (kian)
* Bryan Li (bryli)

Expand All @@ -77,7 +77,7 @@ DeCal Committee (#decal-comm): runs the Decal and staff workshops.

If this is your first time at a staff meeting, we'll need to add you to staff so that you can access resources for contributing!

Before proceeding, **make sure you have an OCF account** (ocf.io/join). This is different from your CalNet account.
Before proceeding, **make sure you have an OCF account** ([ocf.io/join](https://ocf.io/join)). This is different from your CalNet account.

Once you have an OCF account, talk to someone with root access (such as the SM's or GM's) who will be able to add you to the staff role.

Expand All @@ -92,22 +92,22 @@ We'll explore what ssh actually does, as well as some cool things you can do on

## Task 2: Slide into our DM's

Outside of the lab, most of our communication happens over the OCF chat network, which consists of [Discord](ocf.io/discord), [Slack](ocf.io/slack), [IRC](ocf.io/irc), and [Matrix](ocf.io/matrix). All of these are bridged, meaning that sending a message in one platform sends it to all of the other platforms too, so pick your favorite one and click on its link to join!
Outside of the lab, most of our communication happens over the OCF chat network, which consists of [Discord](https://ocf.io/discord), [Slack](https://ocf.io/slack), [IRC](https://ocf.io/irc), and [Matrix](https://ocf.io/matrix). All of these are bridged, meaning that sending a message in one platform sends it to all of the other platforms too, so pick your favorite one and click on its link to join!

Most staff are currently active on Discord, so if you don't have any prior preferences then we recommend you join it so you can reach other staff more easily through DM's.


### Discord Instructions

If you're joining on Discord, you must first verify your account (instructions on the #verify channel).
If you're joining on Discord, you must first verify your account (instructions on the #verify channel).

Once you're verified, send a message to the #introduce-yourself channel so we can get to know you a little better! Once you do so, you'll receive the newstaff and ocf roles.

You should then be able to add yourself to whatever topic-specific roles you desire (such as for committees or groups), so you can get pinged for any action happening in those areas. It's also recommended to turn notifications on for any channels of interest, as committees/groups usually have their own meeting times outside of general meetings that you won't want to miss.

### Slack Instructions

If you're joining Slack, you will need to create an account using your OCF account email ([email protected]). The confirmation email should then be forwarded to your berkeley.edu email address.
If you're joining Slack, you will need to create an account using your OCF account email ([email protected]). The confirmation email should then be forwarded to your berkeley.edu email address.

Once you join, you'll need to manually add the channels you're interested in. A good way to do so is click the "+" button when hovering over Channels, then sort by most members and go down the list from there.

Expand Down

0 comments on commit 47913b4

Please sign in to comment.