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 #152

Merged
merged 13 commits into from
Apr 4, 2024
Merged

Sync Upstream #152

merged 13 commits into from
Apr 4, 2024

Commits on Mar 25, 2024

  1. Add popup to edit user (#132)

    @nickbar01234
    nickbar01234 authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    1d9e5c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Centralize popup (#133)

    @nickbar01234
    nickbar01234 authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    3371be4 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. create subfolder on accepted chapter request

    @tylerrlin
    tylerrlin committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    aa198c8 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. created env variable for base folder, create folder on new chapter, n… 

    …ew senior folder in correct chapter, and update share permissions on new member.
    @tylerrlin
    tylerrlin committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7b70c89 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Add route protection (#137) 

    * Add route protection

* Protect uid segment

* Remove comment
    @nickbar01234
    nickbar01234 authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d651d90 View commit details
    Browse the repository at this point in the history

  2. Update UI (#135) 

    * Update UI

* Fix layout props

* Return if no chapter ID is found

* Address comments
    @nickbar01234
    nickbar01234 authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3a030c9 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. fixed nits

    @tylerrlin
    tylerrlin committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    8795f6e View commit details
    Browse the repository at this point in the history

  2. Add base folder as field for workflow (#140)

    @JuliaZel
    JuliaZel authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    0ed0d38 View commit details
    Browse the repository at this point in the history

  3. Update unit-testing.yml

    @tylerrlin
    tylerrlin authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    4e73172 View commit details
    Browse the repository at this point in the history

  4. Nickbar01234 julia/approve tile (#141) 

    * Update pending card style

* Add to DisplayChapterView

* Update dashboard
    @nickbar01234
    nickbar01234 authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    cb35a3e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #136 from JumboCode/tyler/caleb/drive 

    Tyler/caleb/drive
    @tylerrlin
    tylerrlin authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    28c3863 View commit details
    Browse the repository at this point in the history

  6. Fix route bugs

    @nickbar01234
    nickbar01234 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    3a13cdf View commit details
    Browse the repository at this point in the history

  7. User Tile UI (#139) 

    * styling done, must order.

Co-authored-by: cledi01 <[email protected]>
Co-authored-by: Tyler <[email protected]>
Co-authored-by: Kim Nguyen <[email protected]>
Co-authored-by: Johnny Tan <[email protected]>
Co-authored-by: Won Kim <[email protected]>

* change styling for dropdown position and make role font size smaller

* fix senior tile styling

* small fix

* add sortedStudents function

* add chapter leader and remove president position

* Fix route

---------

Co-authored-by: bellybubjoeOfficial <[email protected]>
Co-authored-by: cledi01 <[email protected]>
Co-authored-by: Tyler <[email protected]>
Co-authored-by: Kim Nguyen <[email protected]>
Co-authored-by: Johnny Tan <[email protected]>
Co-authored-by: Won Kim <[email protected]>
Co-authored-by: wkim10 <[email protected]>
Co-authored-by: nickbar01234 <[email protected]>
    @wkim10 @bellybubjoeOfficial
    @cledi01 @tylerrlin @kimhnguyenn @johnny-t06 @nickbar01234
    9 people authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    a83caa3 View commit details
    Browse the repository at this point in the history