Skip to content

Merge latest unstable into websockets#3619

Merged
bjester merged 39 commits into
learningequality:websocketsfrom
bjester:websockets
Sep 8, 2022
Merged

Merge latest unstable into websockets#3619
bjester merged 39 commits into
learningequality:websocketsfrom
bjester:websockets

Conversation

@bjester

@bjester bjester commented Sep 8, 2022

Copy link
Copy Markdown
Member

Summary

Description of the change(s) you made

  • merges latest unstable branch into websockets

Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

rtibbles and others added 30 commits August 24, 2022 09:11
@rtibbles
Do depth first tree traversal when publishing.
d4851c6 
Allow inheritance of some metadata fields from ancestor topics.
Do not publish learning activities on topics.
@rtibbles
Disable learning activities, accessibility tagging and completion cri…
234e47d 
…teria for topics.
@rtibbles
Stop topics from having accessibility labels.
1e27054 
Remove inheritance from accessibility labels.
@dependabot
Bump django-s3-storage from 0.13.4 to 0.13.9
c1aefc2 
Bumps [django-s3-storage](https://github.com/etianen/django-s3-storage) from 0.13.4 to 0.13.9.
- [Release notes](https://github.com/etianen/django-s3-storage/releases)
- [Changelog](https://github.com/etianen/django-s3-storage/blob/master/CHANGELOG.rst)
- [Commits](etianen/django-s3-storage@0.13.4...0.13.9)

---
updated-dependencies:
- dependency-name: django-s3-storage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump stylus from 0.58.1 to 0.59.0
5feb5a9 
Bumps [stylus](https://github.com/stylus/stylus) from 0.58.1 to 0.59.0.
- [Release notes](https://github.com/stylus/stylus/releases)
- [Changelog](https://github.com/stylus/stylus/blob/dev/Changelog.md)
- [Commits](stylus/stylus@0.58.1...0.59.0)

---
updated-dependencies:
- dependency-name: stylus
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@akolson
adds translated user friendly string for files with no name
4783389
@bjester
Add vuex mutations for handling indexeddb updates
bbacc8d
@bjester
Ensure contentnode table is added to transaction
cfefe93
@bjester
Fix learnerManage handling with completion criteria
448dc77
@bjester
Correct test for updates to update change handling
a9a50aa
@rtibbles
Remove unused dev dependencies.
4e2bbef
@akolson
Adds tests for changes made on FileUploadItem.vue
c491ac0
@bjester
Merge pull request learningequality#3604 from rtibbles/unused_dev_dep…
9f4d367 
…endencies

Remove unused dev dependencies.
@dependabot
Bump django-celery-results from 2.2.0 to 2.4.0
9c6d6bd 
Bumps [django-celery-results](https://github.com/celery/django-celery-results) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/celery/django-celery-results/releases)
- [Changelog](https://github.com/celery/django-celery-results/blob/master/Changelog)
- [Commits](celery/django-celery-results@v2.2.0...v2.4.0)

---
updated-dependencies:
- dependency-name: django-celery-results
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@bjester
Use SSL for Postmark API
ce7a2a0
@bjester
Merge pull request learningequality#3606 from bjester/postmark
d6c1b0c 
Use SSL for Postmark API
@akolson
Removes guest string
298f917
@akolson
adds pr review comments
b9f89e9
@bjester
Merge pull request learningequality#3602 from akolson/string-not-extr…
a475ed5 
…acted-fix

adds translated user friendly string for files with no name
@bjester
Merge pull request learningequality#3609 from akolson/guest-string-re…
35d29b5 
…moval

Removes guest string
@bjester
Correct issues with propogating deletions to nested objects
97e1beb
@bjester
Merge pull request learningequality#3578 from rtibbles/meta_inheritance
021ad4e 
Topic metadata label updates
@bjester
Merge pull request learningequality#3600 from bjester/indexeddb-2-vuex
9d98086 
Handle updates from IndexedDB in Vuex
@bjester
Default learning activities for some kinds
b84130d
@bjester
Don't use variables for string keys
8692795
@bjester
Merge pull request learningequality#3589 from learningequality/depend…
cc6ba96 
…abot/pip/django-s3-storage-0.13.9

Bump django-s3-storage from 0.13.4 to 0.13.9
@dependabot
Bump jsonschema from 3.2.0 to 4.15.0
9ccbde6 
Bumps [jsonschema](https://github.com/python-jsonschema/jsonschema) from 3.2.0 to 4.15.0.
- [Release notes](https://github.com/python-jsonschema/jsonschema/releases)
- [Changelog](https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst)
- [Commits](python-jsonschema/jsonschema@v3.2.0...v4.15.0)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@bjester
Add setting needed for changes in django-celery-results
0ae3e25
@bjester
Merge pull request learningequality#3598 from learningequality/depend…
db75b7b 
…abot/npm_and_yarn/stylus-0.59.0

Bump stylus from 0.58.1 to 0.59.0
@dependabot
Bump uuid from 8.3.2 to 9.0.0
77179a3 
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](uuidjs/uuid@v8.3.2...v9.0.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
rtibbles and others added 9 commits September 8, 2022 09:24
@rtibbles
Merge pull request learningequality#3614 from learningequality/depend…
ad2863a 
…abot/pip/jsonschema-4.15.0

Bump jsonschema from 3.2.0 to 4.15.0
@rtibbles
Merge pull request learningequality#3613 from bjester/string-keys
d7785c7 
Don't use variables for string keys
@dependabot
Bump django-filter from 2.4.0 to 22.1
4f66616 
Bumps [django-filter](https://github.com/carltongibson/django-filter) from 2.4.0 to 22.1.
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst)
- [Commits](carltongibson/django-filter@2.4.0...22.1)

---
updated-dependencies:
- dependency-name: django-filter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull request learningequality#3615 from learningequality/depend…
9bcc409 
…abot/npm_and_yarn/uuid-9.0.0

Bump uuid from 8.3.2 to 9.0.0
@bjester
Merge pull request learningequality#3605 from learningequality/depend…
29d91cc 
…abot/pip/django-celery-results-2.4.0

Bump django-celery-results from 2.2.0 to 2.4.0
@rtibbles
Merge pull request learningequality#3616 from learningequality/depend…
831b4de 
…abot/pip/django-filter-22.1

Bump django-filter from 2.4.0 to 22.1
@bjester
Add defaults for exercises and slideshows
17d1770
@rtibbles
Merge pull request learningequality#3612 from bjester/default-learnin…
3dd217d 
…g-activity

Default learning activities on upload for some content kinds
@bjester
Handle merge conflicts
02e3e5f
@bjester bjester merged commit dc8178e into learningequality:websockets Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rtibbles rtibbles rtibbles approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bjester @rtibbles @akolson