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

Fix #1547, parts of #169, #5344, #5365, #5411: Add data layer support for (multiple) classrooms & topic dependencies, and prepare for #4885 #5398

Merged
merged 10 commits into from
May 29, 2024
Merged

Fix #1547, parts of #169, #5344, #5365, #5411: Add data layer support for (multiple) classrooms & topic dependencies, and prepare for #4885 #5398

merged 10 commits into from
May 29, 2024

Commits on May 17, 2024

  1. Initial changes to support classrooms. 

    This doesn't actually finish the new data definitions or properly
integrate them, nor is it updating any local development assets.
    @BenHenning
    BenHenning committed May 17, 2024
    Configuration menu
    Copy the full SHA
    fe68597 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. Merge branch 'develop' into update-data-layer-to-support-classrooms

    @BenHenning
    BenHenning committed May 26, 2024
    Configuration menu
    Copy the full SHA
    84de087 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Finish introduce multi-classroom data support. 

    Also, prep for other proto dependencies that will be needed by the asset
download script.
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    cc59d40 View commit details
    Browse the repository at this point in the history

  2. Remove prime asset controller + annotations. 

    This functionality hasn't been used in years, and it's unnecessary.
Plus, some lint fixes.
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    efc4ace View commit details
    Browse the repository at this point in the history

  3. Remove unneeded GAE dependencies.

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    41a319e View commit details
    Browse the repository at this point in the history

  4. Static fixes.

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    959890a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into update-data-layer-to-support-classrooms 

    Conflicts:
	third_party/BUILD.bazel
	utility/src/main/java/org/oppia/android/util/caching/BUILD.bazel
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0a78752 View commit details
    Browse the repository at this point in the history

  6. Address self-review comments.

    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    2af9228 View commit details
    Browse the repository at this point in the history

  7. Move to newer oppia_proto_api. 

    This ensures the fixes explained in
bazelbuild/rules_proto#117 and
bazelbuild/bazel#16192 are included to fix CI
breakages on this branch.
    @BenHenning
    BenHenning committed May 27, 2024
    Configuration menu
    Copy the full SHA
    82bb588 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'develop' into update-data-layer-to-support-classrooms

    @BenHenning
    BenHenning committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2ec1541 View commit details
    Browse the repository at this point in the history