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.

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

Hotfixes release for development ending 2022-09-16 #3644

Merged
merged 729 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
729 commits
Select commit Hold shift + click to select a range
ce36717
Remove get_title func no longer needed
bjester Aug 4, 2022
7c779dc
Align Studio frontend linting directives and hook with Kolibri.
rtibbles Aug 4, 2022
5baabca
Remove vuetify-loader.
rtibbles Aug 4, 2022
fc7e057
Merge pull request #3482 from bjester/analytics-reset
bjester Aug 5, 2022
3bdae8a
Add explicit file-loader dependency.
rtibbles Aug 5, 2022
4e8000e
Remove last 2 versions requirement from browserslist and focus on >1%.
rtibbles Aug 5, 2022
6f4419c
Add package.json to checked paths for skip checks for frontend build.
rtibbles Aug 5, 2022
3648d04
Remove old command aliases for linting.
rtibbles Aug 5, 2022
de76c35
Rerun linting when the linting yml file has been updated.
rtibbles Aug 5, 2022
f730306
Merge pull request #3487 from rtibbles/vuetify_loader_no_duh!
bjester Aug 5, 2022
7bf3177
Merge pull request #3485 from bjester/dropdown-position
marcellamaki Aug 5, 2022
177f996
Fix regression in status filtering
bjester Aug 5, 2022
d6284e3
Fix handling of content node creation
bjester Aug 5, 2022
7a120d2
Set created_by_id wherever possible
bjester Aug 5, 2022
d1952f4
Add the current channel id to new content nodes
bjester Aug 5, 2022
fd142e4
Make tooltips lazy to avoid mounting DOM nodes until we need to
bjester Aug 4, 2022
387337c
Update menus to be lazy
bjester Aug 5, 2022
80f5605
Fix jest tests
bjester Aug 5, 2022
c008437
Fix issues with completion criteria not showing
bjester Aug 5, 2022
93e767b
Avoid repeated attempts to queue a storage calculation task
bjester Aug 5, 2022
10c9b96
Fix validation test
bjester Aug 5, 2022
f96442c
Attempt to do automated dependency upgrades.
rtibbles Aug 9, 2022
24ca229
Merge pull request #3491 from rtibbles/dependency_upgrade
rtibbles Aug 9, 2022
e065b6b
Bump @sentry/browser from 5.30.0 to 7.9.0
dependabot[bot] Aug 9, 2022
7bbe861
Bump store2 from 2.13.2 to 2.14.2
dependabot[bot] Aug 9, 2022
41435bb
Bump pdfjs-dist from 2.14.305 to 2.15.349
dependabot[bot] Aug 9, 2022
fd85347
Bump workbox-precaching from 6.5.3 to 6.5.4
dependabot[bot] Aug 9, 2022
b2da0dc
Merge pull request #3492 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 9, 2022
38e4e00
Merge pull request #3496 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 9, 2022
7e6cec0
Merge pull request #3493 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 9, 2022
8152a23
Merge pull request #3494 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 9, 2022
6a39322
Merge pull request #3486 from bjester/root-node-title
rtibbles Aug 10, 2022
16e3864
Merge pull request #3489 from bjester/misc-fixes
rtibbles Aug 10, 2022
4b5fc1f
Update duration to check for second value in files array
marcellamaki Aug 10, 2022
13b175c
Remove tests of defaultUploadTime since it is no longer being used
marcellamaki Aug 10, 2022
0adf950
Bump fake-indexeddb from 3.1.7 to 4.0.0
dependabot[bot] Aug 10, 2022
e4d56e7
Bump qs from 6.10.3 to 6.11.0
dependabot[bot] Aug 10, 2022
4dae581
Bump kolibri-constants from 0.1.40 to 0.1.41
dependabot[bot] Aug 10, 2022
385aec2
Bump dexie-observable from 3.0.0-beta.9 to 3.0.0-beta.11
dependabot[bot] Aug 10, 2022
2b3d90f
Merge pull request #3502 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 10, 2022
9557058
Merge pull request #3503 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 10, 2022
fde58bf
Merge pull request #3504 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 10, 2022
7d674dd
Merge pull request #3505 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 10, 2022
3883c10
Bump stylus from 0.54.8 to 0.58.1
dependabot[bot] Aug 11, 2022
3fecdf2
Bump workbox-webpack-plugin from 6.5.3 to 6.5.4
dependabot[bot] Aug 11, 2022
d563199
Bump vue-router from 3.4.9 to 3.5.4
dependabot[bot] Aug 11, 2022
2522f88
Merge pull request #3514 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 11, 2022
c8123d0
Merge pull request #3517 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 11, 2022
7c5b7a4
Merge pull request #3513 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 11, 2022
bdacf4f
Clean up change tracking, removing locks, and fixing snackbars
bjester Aug 3, 2022
44adf97
Remove event emitter inheritance
bjester Aug 3, 2022
90fb223
Remove revert source, update revert logic to track its changes
bjester Aug 11, 2022
b3a8d78
Bump i18n-iso-countries from 5.5.0 to 7.5.0
dependabot[bot] Aug 11, 2022
07023af
Update docker images to 3.9, and everything else
bjester Aug 11, 2022
15e0e84
base64.decodestring is deprecated
bjester Aug 11, 2022
751beb7
Limit push builds to unstable, hotfixes, and master.
rtibbles Aug 11, 2022
8cb3a2a
Merge pull request #3523 from rtibbles/limit_builds
bjester Aug 11, 2022
d5e5fff
Merge pull request #3522 from bjester/upgrade-python-3.9
bjester Aug 11, 2022
9c1663c
Merge pull request #3521 from learningequality/dependabot/npm_and_yar…
bjester Aug 11, 2022
3b6a6f2
Address feedback, simplify function
marcellamaki Aug 12, 2022
c988c0e
Bump google-cloud-storage from 1.38.0 to 1.41.1
dependabot[bot] Aug 12, 2022
4498420
Bump le-utils from 0.1.40 to 0.1.41
dependabot[bot] Aug 12, 2022
f3f5554
Merge pull request #3528 from learningequality/dependabot/pip/google-…
rtibbles Aug 12, 2022
540cdcf
Bump progressbar2 from 3.38.0 to 3.55.0
dependabot[bot] Aug 12, 2022
2c60869
Merge pull request #3531 from learningequality/dependabot/pip/progres…
rtibbles Aug 12, 2022
2576470
Merge pull request #3530 from learningequality/dependabot/pip/le-util…
rtibbles Aug 12, 2022
464911c
Bump gunicorn from 19.6.0 to 20.1.0
dependabot[bot] Aug 12, 2022
a92b76b
Add fix for grpcio dependencies for Apple M1 computers in readme
sairina Aug 12, 2022
f2c2e52
Merge pull request #3532 from sairina/readme-grpcio
bjester Aug 12, 2022
dcf2d83
Implement final feedback to ensure correct file filtering, to exclude…
marcellamaki Aug 12, 2022
dddcde9
Merge pull request #3529 from learningequality/dependabot/pip/gunicor…
bjester Aug 12, 2022
335e29f
Bump jest-each from 24.9.0 to 28.1.3
dependabot[bot] Aug 15, 2022
174c829
Bump less-loader from 5.0.0 to 11.0.0
dependabot[bot] Aug 15, 2022
2653b93
Bump django-registration from 3.1.2 to 3.3
dependabot[bot] Aug 15, 2022
6376f3a
Bump pillow from 8.3.2 to 9.2.0
dependabot[bot] Aug 15, 2022
08539ff
Merge pull request #3534 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 15, 2022
8bde346
Merge pull request #3540 from learningequality/dependabot/pip/django-…
rtibbles Aug 15, 2022
b378edc
Bump psycopg2-binary from 2.8.6 to 2.9.3
dependabot[bot] Aug 15, 2022
edfe62d
Bump django-redis from 4.12.1 to 5.2.0
dependabot[bot] Aug 15, 2022
a41f93c
Merge pull request #3541 from learningequality/dependabot/pip/psycopg…
rtibbles Aug 15, 2022
db7f0b9
Merge pull request #3542 from learningequality/dependabot/pip/pillow-…
rtibbles Aug 15, 2022
90bd7ad
Merge pull request #3539 from learningequality/dependabot/pip/django-…
rtibbles Aug 15, 2022
6e7ed72
Merge pull request #3538 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 15, 2022
a34942d
Merge pull request #3480 from bjester/change-tracking
rtibbles Aug 15, 2022
c256b32
Add support for file duration and node suggested duration for ricecooker
rtibbles Jun 22, 2022
5f0ede4
Bump core-js from 3.22.8 to 3.24.1
dependabot[bot] Aug 16, 2022
70ffd4b
Bump google-cloud-kms from 0.2.1 to 1.1.0
dependabot[bot] Aug 16, 2022
ce072d7
Merge pull request #3500 from marcellamaki/fix-activity-duration-on-f…
bjester Aug 17, 2022
1677236
Add 'new' to Intl.ListFormat to prevent console errors, non-rendering…
marcellamaki Aug 17, 2022
739051b
Merge pull request #3549 from marcellamaki/fix-intl-listformat-constr…
rtibbles Aug 17, 2022
3aba7c3
Merge pull request #3545 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 17, 2022
8504bae
Bump workbox-window from 6.5.3 to 6.5.4
dependabot[bot] Aug 17, 2022
83fec98
Merge pull request #3552 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 17, 2022
8e09d0f
WIP: adding stale file clean up
bjester Aug 17, 2022
4db3f67
Merge pull request #3546 from learningequality/dependabot/pip/google-…
bjester Aug 18, 2022
fcacb56
Bump django-prometheus from 2.1.0 to 2.2.0
dependabot[bot] Aug 18, 2022
f650d19
Bump google-cloud-core from 1.6.0 to 1.7.3
dependabot[bot] Aug 18, 2022
68b1843
Updates to studio documentation on preferred setup
bjester Aug 22, 2022
ea4118b
Merge pull request #3553 from learningequality/dependabot/pip/django-…
bjester Aug 22, 2022
67d638e
Merge pull request #3554 from learningequality/dependabot/pip/google-…
bjester Aug 22, 2022
3a245d7
Bump backoff from 1.10.0 to 2.1.2
dependabot[bot] Aug 22, 2022
96603a1
Bump django-model-utils from 4.0.0 to 4.2.0
dependabot[bot] Aug 22, 2022
e4f5054
Remove unneeded dependency for dead code
bjester Aug 22, 2022
f54aaf7
Remove gspread too
bjester Aug 22, 2022
39ec19e
Migrate to using the Sentry browser/vue library, Stop relying on Raven.
rtibbles Aug 9, 2022
41ec9b8
Update to 7.11.1
bjester Aug 22, 2022
847fd4c
Merge pull request #3562 from bjester/remove-google-python-api
bjester Aug 22, 2022
fba0707
Merge pull request #3498 from rtibbles/raven_nevermore
bjester Aug 22, 2022
5c686c9
Merge pull request #3488 from rtibbles/browserslist
bjester Aug 22, 2022
f6e9f44
Bump google-cloud-error-reporting from 1.1.2 to 1.4.0
dependabot[bot] Aug 22, 2022
e98c642
Merge pull request #3430 from learningequality/duration_patch
bjester Aug 22, 2022
70c3291
Merge pull request #3564 from learningequality/dependabot/pip/backoff…
bjester Aug 22, 2022
30a9e15
Merge pull request #3563 from learningequality/dependabot/pip/google-…
bjester Aug 22, 2022
c99da14
Add test for and support for copying metadata fields.
rtibbles Aug 22, 2022
6722973
Ignore any imports of vuetify src style files to defer to our vendore…
rtibbles Aug 23, 2022
f55eaa3
Merge pull request #3565 from learningequality/dependabot/pip/django-…
rtibbles Aug 23, 2022
5d9b362
Add test and support for copying suggested_duration field on content …
rtibbles Aug 23, 2022
43562ee
Bump axios from 0.21.4 to 0.27.2
dependabot[bot] Aug 23, 2022
1f0577d
Bump pycountry from 17.5.14 to 22.3.5
dependabot[bot] Aug 23, 2022
984ba93
Merge pull request #3569 from rtibbles/metadata_copying
bjester Aug 23, 2022
bcc3e8e
Merge pull request #3561 from bjester/doc-updates2
AllanOXDi Aug 23, 2022
1425d5c
Merge pull request #3573 from learningequality/dependabot/pip/pycount…
rtibbles Aug 23, 2022
d4851c6
Do depth first tree traversal when publishing.
rtibbles Aug 24, 2022
234e47d
Disable learning activities, accessibility tagging and completion cri…
rtibbles Aug 24, 2022
1e27054
Stop topics from having accessibility labels.
rtibbles Aug 24, 2022
6530206
Merge pull request #3571 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 24, 2022
ec2de4a
Bump showdown from 1.9.1 to 2.1.0
dependabot[bot] Aug 24, 2022
eb99372
Remove unused pycountry dependency.
rtibbles Aug 24, 2022
73c8854
Merge pull request #3579 from learningequality/dependabot/npm_and_yar…
rtibbles Aug 25, 2022
d05c147
Remove deprecated Raven pip dependency.
rtibbles Aug 25, 2022
5b6dadf
Update stale file cleanup function with modified date
LianaHarris360 Aug 25, 2022
5731d4f
Update reference selection for duration for audioVideo resources
marcellamaki Aug 25, 2022
16a60ca
Merge branch 'clean-up-stale-files' into cleanup-stale-files
LianaHarris360 Aug 25, 2022
b55eb93
Update test
marcellamaki Aug 25, 2022
6c7cb87
Merge pull request #3570 from rtibbles/rtl_trever
marcellamaki Aug 26, 2022
8006198
Merge pull request #3483 from bjester/lazy-tooltips
rtibbles Aug 26, 2022
4ed66c3
Created and updated file location and imports for test_decorators.py …
LianaHarris360 Aug 26, 2022
e0e5484
Merge pull request #3583 from marcellamaki/reference-for-audio-video
bjester Aug 29, 2022
2809cf8
Merge pull request #3580 from rtibbles/no_pycountry_for_old_men
bjester Aug 29, 2022
c1aefc2
Bump django-s3-storage from 0.13.4 to 0.13.9
dependabot[bot] Aug 29, 2022
269e7e0
Merge pull request #3581 from rtibbles/never_flitting_still_is_sitting
bjester Aug 29, 2022
355f352
Ensure channel id on create and for moving to trash
bjester Aug 29, 2022
601b338
Update and add tests for channel_id
bjester Aug 29, 2022
28d993e
Merge pull request #3590 from bjester/ensure-channel-id
rtibbles Aug 29, 2022
c1c1189
Defined default variable inside function scope, updated function with…
LianaHarris360 Aug 29, 2022
c6eba7b
Add a check for new entries in the changes table to ensure swift sync…
rtibbles Aug 30, 2022
b4de8c0
Use orderBy not sortBy to set descending order.
rtibbles Aug 30, 2022
ec403dc
Correct other instances of using sortBy with incorrect syntax.
rtibbles Aug 30, 2022
cd95c73
Re-sort catalog list items by name.
rtibbles Aug 30, 2022
56d8784
Add additional check to only try to sync unsynced changes.
rtibbles Aug 31, 2022
aba1e0e
Merge pull request #3591 from rtibbles/ch_ch_ch_ch_changes
bjester Aug 31, 2022
acbe0b4
Merge pull request #3592 from rtibbles/ordah_ordah
rtibbles Aug 31, 2022
bf5cf4b
Updated clean up stale files function to include batch deletion
LianaHarris360 Sep 1, 2022
c603816
Merge pull request #3584 from LianaHarris360/cleanup-stale-files
rtibbles Sep 1, 2022
79a5e9f
Bump uuid from 3.4.0 to 8.3.2
dependabot[bot] Aug 15, 2022
527f76b
Update uuid imports.
rtibbles Sep 2, 2022
faeaa4e
Merge pull request #3535 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 2, 2022
6ef0b38
Bump core-js from 3.24.1 to 3.25.0
dependabot[bot] Sep 2, 2022
75680dd
Merge pull request #3597 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 2, 2022
5feb5a9
Bump stylus from 0.58.1 to 0.59.0
dependabot[bot] Sep 2, 2022
03c8ecd
Bump broadcast-channel from 3.7.0 to 4.14.0
dependabot[bot] Sep 2, 2022
4783389
adds translated user friendly string for files with no name
akolson Sep 2, 2022
bbacc8d
Add vuex mutations for handling indexeddb updates
bjester Sep 2, 2022
cfefe93
Ensure contentnode table is added to transaction
bjester Sep 2, 2022
448dc77
Fix learnerManage handling with completion criteria
bjester Sep 2, 2022
a9a50aa
Correct test for updates to update change handling
bjester Sep 6, 2022
4e2bbef
Remove unused dev dependencies.
rtibbles Sep 6, 2022
c491ac0
Adds tests for changes made on FileUploadItem.vue
akolson Sep 6, 2022
9f4d367
Merge pull request #3604 from rtibbles/unused_dev_dependencies
bjester Sep 6, 2022
9c6d6bd
Bump django-celery-results from 2.2.0 to 2.4.0
dependabot[bot] Sep 6, 2022
ce7a2a0
Use SSL for Postmark API
bjester Sep 6, 2022
d6c1b0c
Merge pull request #3606 from bjester/postmark
bjester Sep 6, 2022
5de3892
Sets ‘has captions or subtitles accessibility’ label if uploaded subt…
LianaHarris360 Sep 6, 2022
298f917
Removes guest string
akolson Sep 7, 2022
b9f89e9
adds pr review comments
akolson Sep 7, 2022
a475ed5
Merge pull request #3602 from akolson/string-not-extracted-fix
bjester Sep 7, 2022
35d29b5
Merge pull request #3609 from akolson/guest-string-removal
bjester Sep 7, 2022
97e1beb
Correct issues with propogating deletions to nested objects
bjester Sep 7, 2022
021ad4e
Merge pull request #3578 from rtibbles/meta_inheritance
bjester Sep 7, 2022
9d98086
Merge pull request #3600 from bjester/indexeddb-2-vuex
bjester Sep 7, 2022
c66b9fc
fix_editor_display
AllanOXDi Sep 8, 2022
b84130d
Default learning activities for some kinds
bjester Sep 8, 2022
8692795
Don't use variables for string keys
bjester Sep 8, 2022
cc6ba96
Merge pull request #3589 from learningequality/dependabot/pip/django-…
bjester Sep 8, 2022
9ccbde6
Bump jsonschema from 3.2.0 to 4.15.0
dependabot[bot] Sep 8, 2022
0ae3e25
Add setting needed for changes in django-celery-results
bjester Sep 8, 2022
db75b7b
Merge pull request #3598 from learningequality/dependabot/npm_and_yar…
bjester Sep 8, 2022
77179a3
Bump uuid from 8.3.2 to 9.0.0
dependabot[bot] Sep 8, 2022
ad2863a
Merge pull request #3614 from learningequality/dependabot/pip/jsonsch…
rtibbles Sep 8, 2022
d7785c7
Merge pull request #3613 from bjester/string-keys
rtibbles Sep 8, 2022
4f66616
Bump django-filter from 2.4.0 to 22.1
dependabot[bot] Sep 8, 2022
9bcc409
Merge pull request #3615 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 8, 2022
29d91cc
Merge pull request #3605 from learningequality/dependabot/pip/django-…
bjester Sep 8, 2022
831b4de
Merge pull request #3616 from learningequality/dependabot/pip/django-…
rtibbles Sep 8, 2022
841ba31
Bump django-mptt from 0.11.0 to 0.13.4
dependabot[bot] Sep 8, 2022
e9fe645
Bump sentry-sdk from 1.1.0 to 1.9.0
dependabot[bot] Sep 8, 2022
cd58e04
Bump python-postmark from 0.5.0 to 0.5.8
dependabot[bot] Sep 8, 2022
17d1770
Add defaults for exercises and slideshows
bjester Sep 8, 2022
3dd217d
Merge pull request #3612 from bjester/default-learning-activity
rtibbles Sep 8, 2022
8940eb1
Merge pull request #3611 from AllanOXDi/fix_editor_display
rtibbles Sep 8, 2022
522bdab
Removed debugging statement
LianaHarris360 Sep 8, 2022
aa0885d
Merge pull request #3617 from learningequality/dependabot/pip/sentry-…
rtibbles Sep 8, 2022
ba1976f
Merge pull request #3618 from learningequality/dependabot/pip/python-…
rtibbles Sep 8, 2022
5fcc583
Merge branch 'unstable' into set-has-captions-label
LianaHarris360 Sep 8, 2022
118e7c1
Removed unused variable
LianaHarris360 Sep 8, 2022
0a180e6
Merge pull request #3608 from LianaHarris360/set-has-captions-label
LianaHarris360 Sep 8, 2022
919af71
Use require imports to avoid dealing with esmodule bundling.
rtibbles Sep 8, 2022
29a57d9
Merge pull request #3566 from learningequality/dependabot/pip/django-…
rtibbles Sep 8, 2022
548816e
Merge pull request #3544 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 8, 2022
c803f12
Bump redis from 3.5.3 to 4.3.4
dependabot[bot] Sep 8, 2022
b808356
Bump jsonschema from 4.15.0 to 4.16.0
dependabot[bot] Sep 9, 2022
da65878
Merge pull request #3628 from learningequality/dependabot/pip/jsonsch…
rtibbles Sep 9, 2022
96e5d9b
Removes use of the clipboard-polyfill and just uses the native API in…
rtibbles Sep 8, 2022
3aae8f1
Merge pull request #3620 from rtibbles/remove-clipboard-polyfill
rtibbles Sep 12, 2022
e837165
Fixes reactivity issues with signing in
bjester Sep 12, 2022
6bf1ca9
Bump core-js from 3.25.0 to 3.25.1
dependabot[bot] Sep 12, 2022
32ade44
Always call ADD_SESSION
bjester Sep 12, 2022
a0cce7a
Merge pull request #3634 from bjester/fix-login-reactivity
rtibbles Sep 12, 2022
243a12d
Fix traceback handling for fake tasks
bjester Sep 12, 2022
0c76978
Updates width of content library channel cards with no description to…
LianaHarris360 Sep 13, 2022
2ddeebf
Merge pull request #3636 from bjester/fix-exception-traceback
bjester Sep 13, 2022
b8151d1
Separate transactions applying changes; refactor move/copy saving of …
bjester Sep 14, 2022
5789d29
Refactor frontend-only fields and defensiveness
bjester Sep 14, 2022
5e231ec
Removed channel-cards class and set width to 100%; fixes the overflow…
LianaHarris360 Sep 15, 2022
3f596a8
Merge pull request #3640 from bjester/relay-changes
rtibbles Sep 15, 2022
0170e1f
Merge pull request #3643 from learningequality/hotfixes
rtibbles Sep 15, 2022
875bb59
Merge pull request #3633 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 15, 2022
cf78e6d
Bump jest-each from 28.1.3 to 29.0.3
dependabot[bot] Sep 15, 2022
22e208d
Merge pull request #3645 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 15, 2022
ad98206
Use the file format as the default extension in case the passed in na…
rtibbles Sep 16, 2022
08bbbff
Add files existance and length check so validation is run after files…
marcellamaki Sep 16, 2022
0da0dcc
Hide tooltip for certain accessibility options, and reorder them
bjester Sep 16, 2022
125d3d6
Bump broadcast-channel from 4.14.0 to 4.17.0
dependabot[bot] Sep 16, 2022
2714e52
Update accessibility options test
bjester Sep 16, 2022
0aa17f1
Update gherkin scenario
bjester Sep 16, 2022
d8b8ffa
Add condition for no files
marcellamaki Sep 16, 2022
d52e8a0
Studio fts database updates
vkWeb Sep 16, 2022
e2cdd24
Merge pull request #3648 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 16, 2022
44edee5
Bump pdfjs-dist from 2.15.349 to 2.16.105
dependabot[bot] Sep 16, 2022
54f7790
Merge pull request #3651 from vkWeb/fts_db_updates
bjester Sep 16, 2022
a05ac87
Added width and flex-grow styling to ChannelItem implementation withi…
LianaHarris360 Sep 16, 2022
8c7e923
Merge pull request #3639 from LianaHarris360/content-library-cards-width
bjester Sep 16, 2022
d913900
Merge pull request #3653 from learningequality/dependabot/npm_and_yar…
rtibbles Sep 16, 2022
605106a
Merge pull request #3646 from rtibbles/file_format
bjester Sep 16, 2022
c38a051
Merge pull request #3567 from learningequality/dependabot/pip/redis-4…
bjester Sep 16, 2022
055a248
Remove test, revert changes
marcellamaki Sep 16, 2022
98e70e1
Merge pull request #3647 from marcellamaki/file-validation
bjester Sep 16, 2022
99db2a2
Merge pull request #3649 from bjester/accessibility-tooltips
bjester Sep 19, 2022
19cf3ef
Fix assertions against isNew now that it's DELAYED_VALIDATION
bjester Sep 19, 2022
eae5b0c
Merge pull request #3641 from bjester/defensive-syncs
rtibbles Sep 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
const esLintConfig = require('kolibri-tools/.eslintrc');
const webpack = require('./webpack.config.js')();

esLintConfig.globals = {
$: false,
_: false,
MathQuill: false,
HandlebarsIntl: false,
MathJax: false,
Sentry: false,
jest: false,
Raven: false,
};
esLintConfig.settings['import/resolver'] = 'webpack';
esLintConfig.settings['import/resolver']['webpack'] = { config: 'webpack.config.js'};

// Vuetify's helper attributes use hyphens and they would
// not be recognized if auto-formatted to camel case
Expand Down
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Automatically update versions for pip and npm

version: 2
updates:

# Maintain dependencies for Python
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"

# Maintain dependencies for Javascript
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
20 changes: 13 additions & 7 deletions .github/workflows/deploytest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Build and deploy tests

on: [push, pull_request]
on:
push:
branches:
- unstable
- hotfixes
- master
pull_request:

jobs:
pre_job:
Expand All @@ -14,7 +20,7 @@ jobs:
uses: fkirc/skip-duplicate-actions@master
with:
github_token: ${{ github.token }}
paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "yarn.lock"]'
paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "yarn.lock", "package.json"]'
build_assets:
name: Build frontend assets
needs: pre_job
Expand All @@ -25,7 +31,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '16.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -38,18 +44,18 @@ jobs:
yarn --frozen-lockfile
npm rebuild node-sass
- name: Build frontend
run: yarn run build -p
run: yarn run build
make_messages:
name: Build all message files
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.6
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.9
- name: pip cache
uses: actions/cache@v2
with:
Expand All @@ -65,7 +71,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '16.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/frontendlint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Javascript Linting

on: [push, pull_request]
on:
push:
branches:
- unstable
- hotfixes
- master
pull_request:

jobs:
pre_job:
Expand All @@ -14,7 +20,7 @@ jobs:
uses: fkirc/skip-duplicate-actions@master
with:
github_token: ${{ github.token }}
paths: '["**.vue", "**.js", "yarn.lock"]'
paths: '["**.vue", "**.js", "yarn.lock", ".github/workflows/frontendlint.yml"]'
test:
name: Frontend linting
needs: pre_job
Expand All @@ -25,7 +31,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '16.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
Expand All @@ -38,7 +44,7 @@ jobs:
yarn --frozen-lockfile
npm rebuild node-sass
- name: Run tests
run: yarn run lint-all:fix
run: yarn run lint-frontend:format
- name: Check for modified files
if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
id: git-check
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/frontendtest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Javascript Tests

on: [push, pull_request]
on:
push:
branches:
- unstable
- hotfixes
- master
pull_request:

jobs:
pre_job:
Expand All @@ -25,7 +31,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '16.x'
- name: Cache Node.js modules
uses: actions/cache@v2
with:
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/pythontest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Python tests

on: [push, pull_request]
on:
push:
branches:
- unstable
- hotfixes
- master
pull_request:

jobs:
pre_job:
Expand Down Expand Up @@ -44,7 +50,7 @@ jobs:
# Label used to access the service container
redis:
# Docker Hub image
image: redis:4.0.9
image: redis:6.0.9
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"
Expand All @@ -64,10 +70,10 @@ jobs:
-v /tmp/minio_data:/data \
-v /tmp/minio_config:/root/.minio \
minio/minio server /data
- name: Set up Python 3.6
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.9
- name: pip cache
uses: actions/cache@v2
with:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@ docs/_build/
# PyBuilder
target/

# virtualenv
# virtualenv, pipenv, etc
.env
.envrc
venv
.venv
Pipfile
Pipfile.lock

Thumbs.db
.DS_Store
Expand Down
6 changes: 0 additions & 6 deletions .huskyrc

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ repos:
- id: frontend-lint
name: Linting of JS, Vue, SCSS and CSS files
description: This hook handles all frontend linting for Kolibri Studio
entry: yarn run lint --write --pattern
entry: yarn run lint-frontend:format
language: system
files: \.(js|vue|scss|less|css)$
3 changes: 2 additions & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
*/
'selector-max-id': null, // This would require a major refactor
'at-rule-no-unknown': null, // we're using LESS
'scss/at-rule-no-unknown': null // we're using LESS
'scss/at-rule-no-unknown': null, // we're using LESS
'csstree/validator': null // this triggers issues with unknown at rules too.
},
};
Loading