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

Merge v0.14.0 tag into develop branch #7450

Merged
merged 47 commits into from
Aug 7, 2020
Merged

Merge v0.14.0 tag into develop branch #7450

merged 47 commits into from
Aug 7, 2020

Commits on Aug 1, 2020

  1. improved layout

    @indirectlylit
    indirectlylit committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    d241548 View commit details
    Browse the repository at this point in the history

  2. remove truncator from topic title

    @indirectlylit
    indirectlylit committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    1784ab2 View commit details
    Browse the repository at this point in the history

  3. don't render unnecessary parts of TextTruncator

    @indirectlylit
    indirectlylit committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    4868f38 View commit details
    Browse the repository at this point in the history

  4. remove tooltip from text truncator

    @indirectlylit
    indirectlylit committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    b13494d View commit details
    Browse the repository at this point in the history

  5. bug fix

    @indirectlylit
    indirectlylit committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    4e2ccd5 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. linting

    @indirectlylit
    indirectlylit committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    3f5df7f View commit details
    Browse the repository at this point in the history

  2. Network name -> Name

    @indirectlylit
    indirectlylit committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    95bceb3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge pull request learningequality#7420 from indirectlylit/cards 

    update to channel layout and text truncator
    @indirectlylit
    indirectlylit committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    8e91bad View commit details
    Browse the repository at this point in the history

  2. Try to prevent runtime error if User has incomplete roles set

    @jonboiser
    jonboiser committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    7e0f5ad View commit details
    Browse the repository at this point in the history

  3. Pass filenames to only lint changed files in pre-commit.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    afc3f4f View commit details
    Browse the repository at this point in the history

  4. Update .pre-commit-config.yaml 

    Co-authored-by: Jonathan Boiser <jonboiser@users.noreply.github.com>
    @rtibbles @jonboiser
    rtibbles and jonboiser committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    9e65b83 View commit details
    Browse the repository at this point in the history

  5. Fetch topic child progress by parent id.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    f3dbfb6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request learningequality#7432 from jonboiser/default-user-… 

    …type-to-learner

Prevent runtime error in UserType.js if FacilityUser has an incomplete set of Roles
    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    47b521c View commit details
    Browse the repository at this point in the history

  7. Load content progress by lesson id

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    9232a37 View commit details
    Browse the repository at this point in the history

  8. Merge pull request learningequality#7430 from indirectlylit/name 

    Network name -> Name
    @jonboiser
    jonboiser committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    80bc8cb View commit details
    Browse the repository at this point in the history

  9. Fetch contentnode progress in recommended components. 

    Batch fetching when more than 50.
    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    65cc7db View commit details
    Browse the repository at this point in the history

  10. Load ancestor information with content nodes.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    c16dfff View commit details
    Browse the repository at this point in the history

  11. Update lesson editing to handle missing content.

    @rtibbles
    rtibbles committed Aug 4, 2020
    2 Configuration menu
    Copy the full SHA
    0ea795a View commit details
    Browse the repository at this point in the history

  12. Catch missing content in quiz previews.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    2ccfdb6 View commit details
    Browse the repository at this point in the history

  13. Remove outdated test.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    5e7cdf7 View commit details
    Browse the repository at this point in the history

  14. Update EditDetailsResourceListTable for missing content.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    7926ff5 View commit details
    Browse the repository at this point in the history

  15. Fix resource backup setting which would have removed missing content … 

    …on undo.
    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    edab8e3 View commit details
    Browse the repository at this point in the history

  16. buttons in tables should be flat, not raised

    @indirectlylit
    indirectlylit committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    898eabf View commit details
    Browse the repository at this point in the history

  17. Merge pull request learningequality#7433 from rtibbles/linting_again

    @jonboiser
    jonboiser committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    c27e76d View commit details
    Browse the repository at this point in the history

  18. Remove subpage module.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    58d41d5 View commit details
    Browse the repository at this point in the history

  19. Remove dead code.

    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    b4d4d62 View commit details
    Browse the repository at this point in the history

  20. Merge pull request learningequality#7435 from indirectlylit/flat

    @jonboiser
    jonboiser committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    3a091bc View commit details
    Browse the repository at this point in the history

  21. Merge pull request learningequality#7434 from rtibbles/progress_fetch 

    Progress fetching url limiting
    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    6f4fd6f View commit details
    Browse the repository at this point in the history

  22. fixes learningequality#7437

    @indirectlylit
    indirectlylit committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    0b7d5ae View commit details
    Browse the repository at this point in the history

  23. fixes learningequality#7422

    @indirectlylit
    indirectlylit committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    0c92c44 View commit details
    Browse the repository at this point in the history

  24. Workaround for queries that can't be used as subqueries

    @micahscopes
    micahscopes committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    00a6256 View commit details
    Browse the repository at this point in the history

  25. Merge pull request learningequality#20 from micahscopes/missing_content 

    Workaround for queries that can't be used as subqueries
    @rtibbles
    rtibbles committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    3a1090b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. relax shutdown time requirement on zombie test

    @micahscopes
    micahscopes committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    80ffebe View commit details
    Browse the repository at this point in the history

  2. Merge pull request learningequality#7438 from indirectlylit/more-cards

    @jonboiser
    jonboiser committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    dfa3753 View commit details
    Browse the repository at this point in the history

  3. Merge pull request learningequality#7431 from rtibbles/missing_content

    @jonboiser
    jonboiser committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    8a3e835 View commit details
    Browse the repository at this point in the history

  4. more explicit shutdown time test

    @micahscopes
    micahscopes committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    cdff1e9 View commit details
    Browse the repository at this point in the history

  5. ensure travis runs timely_shutdown_no_zombies

    @micahscopes
    micahscopes committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    6222402 View commit details
    Browse the repository at this point in the history

  6. Bump kolibri_exercise_perseus_plugin to 1.3.3

    @jonboiser
    jonboiser committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    b8f4ca6 View commit details
    Browse the repository at this point in the history

  7. stop time test: fix iteration

    @micahscopes
    micahscopes committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    75fdf3f View commit details
    Browse the repository at this point in the history

  8. Merge pull request learningequality#7443 from micahscopes/give-zombie… 

    …s-a-chance-to-finish

Give zombies a chance to finish
    @rtibbles
    rtibbles committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    be91fd1 View commit details
    Browse the repository at this point in the history

  9. Bump kolibri-design-system to 0.2.0

    @jonboiser
    jonboiser committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    f3ecf47 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Update crowdin context

    @jonboiser
    jonboiser committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    0c70de0 View commit details
    Browse the repository at this point in the history

  2. Update font subset css files

    @jonboiser
    jonboiser committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    71fdf1e View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG for 0.14.0

    @jonboiser
    jonboiser committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    c002c49 View commit details
    Browse the repository at this point in the history

  4. Update VERSION to (0, 14, 0, “final”, 0)

    @jonboiser
    jonboiser committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    76bbfbc View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Update VERSION = (0, 14, 1, "alpha", 0)

    @jonboiser
    jonboiser committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    0beb63c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release-v0.14.x' into 0.14.0-int… 

    …o-develop
    @jonboiser
    jonboiser committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    743c10a View commit details
    Browse the repository at this point in the history