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

186506915 sort by bookmarks starred #2148

Merged
merged 19 commits into from
Jan 25, 2024
Merged

186506915 sort by bookmarks starred #2148

merged 19 commits into from
Jan 25, 2024

Commits on Jan 16, 2024

  1. Publish

    @dennisrcao
    dennisrcao committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    794c3e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Push progress - replaced star with bookmark svg

    @dennisrcao
    dennisrcao committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    0aaf1eb View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Update branch

    @dennisrcao
    dennisrcao committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    4afafd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Push to then merge latest sort-by-strategy branch (new master eventua… 

    …lly)
    @dennisrcao
    dennisrcao committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    3f909b2 View commit details
    Browse the repository at this point in the history

  2. Modified svg icon to allow for multiple widths 

    Changed four-up in Dashboard > Published Work to include bookmark instead of star
    @dennisrcao
    dennisrcao committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    e37abf0 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Commit to go back to sort-by-strategy to fix merge conflict.

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    515f9b6 View commit details
    Browse the repository at this point in the history

  2. Merge branch sort-by-strategy into current branch

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    fea0251 View commit details
    Browse the repository at this point in the history

  3. Got rid of errors

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    15e94d8 View commit details
    Browse the repository at this point in the history

  4. Clean up #1

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    2f41526 View commit details
    Browse the repository at this point in the history

  5. Clean up #2

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    bcba4ac View commit details
    Browse the repository at this point in the history

  6. Switch to test on master

    @dennisrcao
    dennisrcao committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    5a45312 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Back to default

    @dennisrcao
    dennisrcao committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    5fb7da7 View commit details
    Browse the repository at this point in the history

  2. Clean up, push to switch and then merge master

    @dennisrcao
    dennisrcao committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    4d10d5f View commit details
    Browse the repository at this point in the history

  3. Merge branch '186665118-sort-by-strategy' into 186506915-sort-by-book… 

    …marks-starred
    Dennis Cao committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    943e57d View commit details
    Browse the repository at this point in the history

  4. Removed filteredDocsByType to deploy

    @dennisrcao
    dennisrcao committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    9357fe5 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'master' into 186506915-sort-by-bookmarks-starred

    Dennis Cao committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0e534e7 View commit details
    Browse the repository at this point in the history

  2. Fixed issue where starring documents in My Work > Workspaces was not … 

    …showing up in "Starred/Bookmarks" tab
    @dennisrcao
    dennisrcao committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    eb078b1 View commit details
    Browse the repository at this point in the history

  3. Fixed nav_panel_test_spec.js

    @dennisrcao
    dennisrcao committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7b0a67f View commit details
    Browse the repository at this point in the history

  4. Fixed canvas_test_spec.js and teacher_curatio_spec.js

    @dennisrcao
    dennisrcao committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e1ed075 View commit details
    Browse the repository at this point in the history