Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Frank the shark with Chip the capybara #1003

Merged
merged 4 commits into from Dec 7, 2023
Merged

Conversation

EthanThatOneKid
Copy link
Owner

@EthanThatOneKid EthanThatOneKid commented Dec 7, 2023

Changes

In place of Frank, we use images of Chip in anticipation of 6.0.

Dependencies

Resolves #656.

commit 952534e
Merge: 57d3455 bb08714
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Thu Dec 7 13:42:15 2023 -0800

    Merge branch 'main' into fix/997

commit 57d3455
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Thu Dec 7 12:40:25 2023 -0800

    fix officers

commit 9dee013
Merge: 92d199f 2316b8f
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Thu Dec 7 12:06:06 2023 -0800

    Merge branch 'main' into fix/997

commit 92d199f
Author: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Thu Dec 7 12:04:37 2023 -0800

    fix assets mistakes

    Resolves <#1001 (review)>.

commit 77faa00
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 22:58:40 2023 -0800

    add people

    TODO: Open new issue in [Boardd](https://oss.acmcsuf.com/boardd) related to changing the location of the image assets for people.

commit f801145
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 22:47:57 2023 -0800

    add 1st assets

commit 8e16b4e
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 22:46:14 2023 -0800

    add cssg assets

commit 97f948a
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:51:17 2023 -0800

    wip

commit 483cb86
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:50:51 2023 -0800

    add jpg assets

commit 047ca2e
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:50:10 2023 -0800

    add png assets

commit cec8e19
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:43:47 2023 -0800

    add pomo asset

commit e2ea691
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:42:44 2023 -0800

    add quiz assets

commit 149310b
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:40:34 2023 -0800

    add svg assets

commit 2e9c0e6
Author: EthanThatOneKid <31261035+EthanThatOneKid@users.noreply.github.com>
Date:   Wed Dec 6 20:40:12 2023 -0800

    remove assets
Copy link

netlify bot commented Dec 7, 2023

Deploy Preview for acmcsuf ready!

Name Link
🔨 Latest commit bc5772e
🔍 Latest deploy log https://app.netlify.com/sites/acmcsuf/deploys/65724b79b4f39f00083d7beb
😎 Deploy Preview https://deploy-preview-1003--acmcsuf.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Collaborator

@karnikaavelumani karnikaavelumani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@karnikaavelumani karnikaavelumani merged commit 0c8dcf8 into main Dec 7, 2023
6 checks passed
@karnikaavelumani karnikaavelumani deleted the fix/656 branch December 7, 2023 22:49
@diamondburned
Copy link
Collaborator

who?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Frank is dead
3 participants