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.

Sign up for GitHub

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

Jump to bottom

Sync Upstream #176

Merged
merged 16 commits into from
Apr 30, 2024
Merged

Sync Upstream #176

merged 16 commits into from
Apr 30, 2024

Commits on Apr 15, 2024

  1. Created the mailchimp connection for adding emails 

    Co-authored-by: Johnny Tan <[email protected]>
    @sburchfield33 @johnny-t06
    sburchfield33 and johnny-t06 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    e235eb5 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Changed the API for Mailchimp

    @sburchfield33
    sburchfield33 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    4c4b0c9 View commit details
    Browse the repository at this point in the history

  2. Prettified Code!

    @sburchfield33 @actions-user
    sburchfield33 authored and actions-user committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    4e50caa View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. mailchimp server config from API key

    @johnny-t06
    johnny-t06 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    8c9b9dd View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Updated github actions yaml file

    @sburchfield33
    sburchfield33 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    9f329a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sburchfield33-johnny-t06-mailchimp' of github.com:Jumbo… 

    …Code/TheLegacyProject2 into sburchfield33-johnny-t06-mailchimp
    @sburchfield33
    sburchfield33 committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c8bf6f7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #167 from JumboCode/sburchfield33-johnny-t06-mailc… 

    …himp

Sburchfield33 johnny t06 mailchimp
    @johnny-t06
    johnny-t06 authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c66c226 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. fa/won/style-landing

    @ffft1215
    ffft1215 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ae65778 View commit details
    Browse the repository at this point in the history

  2. Make add file popup more consistent to add senior pop-up (#171) 

    * Make add file popup more consistent to add senior pop-up

* Make screen responsive to reduction in screen width. And also scrolalble.

* Update font size

* Remove add photo option

---------

Co-authored-by: nickbar01234 <[email protected]>
    @cledi01 @nickbar01234
    cledi01 and nickbar01234 authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d2c9454 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge pull request #175 from JumboCode/fa/won/style-landing 

    fa/won/style-landing
    @ffft1215
    ffft1215 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    4a3fe98 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. deleted seniors, request, and chapter (#173) 

    * deleted seniors, request, and chapter

* Co-authored-by: Nick Doan <[email protected]>

* pr changes

* deleted seniors, request, and chapter
    @nathan-j-edwards
    nathan-j-edwards authored Apr 28, 2024
    Configuration menu
    Copy the full SHA
    cde0fb2 View commit details
    Browse the repository at this point in the history

  2. Display chapter request metadata (#174) 

    * Display chapter request metadata

* Fix styling nits

* Fix missing duration

* Add vertical padding to dropdown container
    @nickbar01234
    nickbar01234 authored Apr 28, 2024
    Configuration menu
    Copy the full SHA
    06e5c8a View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Error Boundary (#177) 

    * Add error handling UI

* Update redirect message

* Update boundary
    @nickbar01234
    nickbar01234 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    31eba0b View commit details
    Browse the repository at this point in the history

  2. Fix shadow

    @nickbar01234
    nickbar01234 committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    8c9a81d View commit details
    Browse the repository at this point in the history

  3. Johnny/won/nick/photo carousel 2 (#178) 

    * photo carousel attempt

Co-authored-by: Johnny Tan <[email protected]>
Co-authored-by: Nick Doan <[email protected]>
Co-authored-by: sburchfield33 <[email protected]>

* attempt 2

* ui fixes

---------

Co-authored-by: wkim10 <[email protected]>
Co-authored-by: Johnny Tan <[email protected]>
Co-authored-by: Nick Doan <[email protected]>
Co-authored-by: sburchfield33 <[email protected]>
    @johnny-t06 @nickbar01234 @sburchfield33
    5 people authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5c6fd77 View commit details
    Browse the repository at this point in the history

  4. Delete senior folder from drive (#176) 

    * Delete senior folder from drive

* Return delete id
    @nickbar01234
    nickbar01234 authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    bd280a5 View commit details
    Browse the repository at this point in the history