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

Jakob/extra issues #402

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Jakob/extra issues #402

merged 3 commits into from
Jan 29, 2024

Conversation

jakobreinwald
Copy link
Collaborator

Finishes #382 , #385

@github-actions github-actions bot added documentation Improvements or additions to documentation infra Related to build/deployment infrastructure homepage The homepage prizes The prizes page page Related to header/footer/things that show up on every page workshops announcements The announcements page labels Jan 29, 2024
@jakobreinwald jakobreinwald changed the base branch from main to dev January 29, 2024 00:26
@github-actions github-actions bot removed documentation Improvements or additions to documentation infra Related to build/deployment infrastructure page Related to header/footer/things that show up on every page labels Jan 29, 2024
Copy link
Contributor

@nathanzzhang nathanzzhang left a comment

Choose a reason for hiding this comment

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

lgtm!

@jakobreinwald jakobreinwald merged commit 86dae17 into dev Jan 29, 2024
2 checks passed
@jakobreinwald jakobreinwald deleted the jakob/ExtraIssues branch January 29, 2024 00:36
jakobreinwald added a commit that referenced this pull request Jan 29, 2024
* fix package.json and remove problematic imports in WorkshopPage

* Hid Announcements expect the last one

* Update Hack Email to hack@uclaacm.com

* Kayla/add application link (#394)

* Changed application link to the HOTH XI application.

* changed application link in banner.js

---------

Co-authored-by: Kayla Hamakawa <kaylahamakawa@MacBook-Pro.local>

* New updated email without changing hackbot

* Update FAQ section (#399)

* Update FAQ section (change app deadline, location, date, num)

* Update FAQ section (change app deadline, location, date, num)

* Update FAQ section (change app deadline, location, date, num)

* Aazel/update constants (#401)

* updated dates for constant.js

* updated dates for constant.js

---------

Co-authored-by: aazel tan <aazeltan@aazels-MacBook-Air.local>

* Kaylin/show past year workshops (#395)

* added past year workshops message

* fixed spacing

* fixed spacing

* spacing

* spacing

* coming soon added

* removed note styling

* removed note section

* removed div and added spaces around workshopCards

* Jakob/extra issues (#402)

* Updated X to XI

* Updated descriptions

* Missed one spot

---------

Co-authored-by: Nathan Zhang <nathanz.zhang@gmail.com>
Co-authored-by: Sneha Agarwal <snehaagar2023@gmail.com>
Co-authored-by: kaylahama <146313133+kaylahama@users.noreply.github.com>
Co-authored-by: Kayla Hamakawa <kaylahamakawa@MacBook-Pro.local>
Co-authored-by: snehaagar2023 <70035220+snehaagar2023@users.noreply.github.com>
Co-authored-by: hannahkendall04 <142450397+hannahkendall04@users.noreply.github.com>
Co-authored-by: aazeltan <137434127+aazeltan@users.noreply.github.com>
Co-authored-by: aazel tan <aazeltan@aazels-MacBook-Air.local>
Co-authored-by: kaylin chung <118630822+kaylin-chung@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
announcements The announcements page homepage The homepage prizes The prizes page workshops
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants