Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
871 commits
Select commit Hold shift + click to select a range
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
7a87cc6
Merge pull request #3644 from learningequality/unstable
bjester Sep 19, 2022
6fcbeef
Ensure we set item-text, so option text renders correctly
bjester Sep 22, 2022
7760c1d
Update metadata inheritance behaviour to pass through folders and onl…
rtibbles Sep 23, 2022
2b406ba
Merge pull request #3667 from bjester/multi-select-text
marcellamaki Sep 23, 2022
0ed50bf
Refactor nested field getter for bulk editing
bjester Sep 23, 2022
b18228c
Make language inherited from ancestors also.
rtibbles Sep 23, 2022
8c89cc9
Merge pull request #3671 from rtibbles/topic_metadata_updates
bjester Sep 23, 2022
fbe6016
Merge pull request #3670 from bjester/bulk-metadata-editing
rtibbles Sep 23, 2022
d767f21
Resolve issue with selection mismatch between autocomplete and checkbox
bjester Sep 23, 2022
e8a6530
Merge pull request #3674 from bjester/category-option-selection
rtibbles Sep 23, 2022
80df99d
Adds testing for publishing of old and new mastery models. Fixes issu…
rtibbles Sep 27, 2022
8128d94
Coerce returned channel_id to be a simple string rather than full uuid.
rtibbles Sep 27, 2022
1b1ed50
Remove duplication apply modifications function.
rtibbles Sep 27, 2022
ac9ace6
Update all indexedDB listener mutations to set the map to ensure reac…
rtibbles Sep 27, 2022
7b482e7
Coerce all file durations with floor instead of ceil.
rtibbles Sep 27, 2022
796b011
Merge pull request #3685 from rtibbles/hunting_for_ceils
rtibbles Sep 28, 2022
0990594
Add reactivity test for Content node indexedDB update mutation.
rtibbles Sep 28, 2022
2eb9936
Fixed paragraph formatting and broken links within studio welcome email
LianaHarris360 Sep 28, 2022
e37f682
Set empty nested maps if they don't exist.
rtibbles Sep 28, 2022
4bffcaf
Update strings based on review.
rtibbles Sep 28, 2022
ac85bcc
Update resources needed.
rtibbles Sep 29, 2022
22d3a47
Adds a persistent hint to add more detail for other supplies.
rtibbles Sep 29, 2022
4832325
Updated domain value for dictionaries within users.py
LianaHarris360 Sep 29, 2022
4ea3285
Handle reverting moves; fix error when no changes were observed
bjester Sep 29, 2022
bfd0bef
Handle case where multiple content tags exist for tag_name and null c…
rtibbles Sep 29, 2022
c0eb5df
Remove unused decorator from models.py
rtibbles Sep 29, 2022
dd226be
Add tests for tag syncing and regression test for fix.
rtibbles Sep 29, 2022
292e59c
Set original_channel_id on the frontend to prevent errors on first re…
rtibbles Sep 29, 2022
10f4e34
Only prevent refresh from the backend if changes have not been synced.
rtibbles Sep 29, 2022
855a897
Merge pull request #3700 from bjester/fix-revert
rtibbles Sep 29, 2022
31c7d64
Do existence check on navigator.clipboard.
rtibbles Sep 29, 2022
99a75c8
Merge pull request #3687 from rtibbles/mutations
bjester Sep 29, 2022
eb510f0
Merge pull request #3697 from rtibbles/strings_n_things
bjester Sep 29, 2022
9129835
Sets a default ordering on the channel endpoint.
rtibbles Sep 29, 2022
7f78087
Add separate conditions for label mapping mis-match so strings displa…
marcellamaki Sep 30, 2022
c76a65e
Merge pull request #3701 from rtibbles/that_syncing_feeling_again
bjester Sep 30, 2022
a81113b
Merge pull request #3684 from rtibbles/mastery_not_yet_100
bjester Sep 30, 2022
0e22f28
Merge pull request #3704 from marcellamaki/fix-metadata-labels
bjester Sep 30, 2022
7de1bf1
Change Reference to be a completion option, rather than a duration op…
marcellamaki Sep 30, 2022
738ad31
Update gherkin scenarios corresponding to changes in completion to no…
marcellamaki Sep 30, 2022
abea46c
Update tests in line with new conditions
marcellamaki Sep 30, 2022
e26f210
Add missing string after rebase
marcellamaki Sep 30, 2022
0e449db
Updated slide presentation link
LianaHarris360 Sep 30, 2022
0b482e6
Update document model/threshold behavior for reference option
marcellamaki Sep 30, 2022
02e7666
Resolve issues with editing and browsing newly added topics
bjester Sep 30, 2022
08f874a
Fix string
marcellamaki Sep 30, 2022
765c113
Add existance check to completion_criteria to prevent error in comple…
marcellamaki Sep 30, 2022
05b3149
Merge pull request #3705 from marcellamaki/updates-to-completion-dura…
rtibbles Sep 30, 2022
63fa6aa
Simplify layout fluidness, resolving issues with dropdown menu display
bjester Sep 26, 2022
b51181c
Add DropdownWrapper, refactor for consistent display
bjester Sep 28, 2022
77dc228
Stop searching when body is reached
bjester Sep 29, 2022
98faffb
Flyby RTL fixes
bjester Sep 29, 2022
e135891
Remove lazy so test will pass
bjester Sep 29, 2022
514acc0
Merge pull request #3696 from LianaHarris360/welcome-email-formatting
bjester Sep 30, 2022
982fc02
Update where method logic to prevent fetches that would fail
bjester Sep 30, 2022
909ee05
Merge pull request #3707 from bjester/topics-are-folders
rtibbles Sep 30, 2022
6bb154d
Revert incorrect RTL fixes due to devserver
bjester Sep 30, 2022
4a98923
Add dropdown wrapper to a couple more selects
bjester Sep 30, 2022
d97db89
Merge pull request #3679 from bjester/import-search-layout
marcellamaki Sep 30, 2022
e8421ab
Merge pull request #3698 from rtibbles/clipboard_context
marcellamaki Sep 30, 2022
98f38d8
Merge pull request #3702 from rtibbles/ordah_ordah
marcellamaki Oct 3, 2022
32f611f
Tweaks to welcome email, and signatures across all html emails
bjester Oct 4, 2022
b3c9024
Merge pull request #3714 from bjester/email-tweaks
bjester Oct 4, 2022
fbb8b46
Remove feature flag for channel quizzes, to improve completion and du…
marcellamaki Oct 5, 2022
247481f
Hide published status when syncing
bjester Oct 5, 2022
ed17889
Merge pull request #3717 from bjester/sync-progress
rtibbles Oct 6, 2022
4d89608
Remove obsolete test
marcellamaki Oct 6, 2022
f079615
Merge pull request #3722 from marcellamaki/updates-to-completion-dura…
rtibbles Oct 6, 2022
a44fa67
Add logging around task fetching and enqueuing
bjester Oct 7, 2022
1561225
Reset new/updated descendant flag on publish
bjester Oct 12, 2022
08d80b1
Merge pull request #3732 from bjester/publish-status
rtibbles Oct 12, 2022
ce9a704
Merge pull request #3724 from bjester/fetch-task-logging
rtibbles Oct 12, 2022
62fcfc2
Merge branch 'master' into hotfixes
bjester Oct 17, 2022
56769c4
download the files into the correct place
nucleogenesis Oct 17, 2022
69c388b
Merge pull request #3742 from nucleogenesis/t8ns-from-unstable
bjester Oct 17, 2022
9d3f2e4
Remove files causing confusing structure
bjester Oct 17, 2022
7a4abba
Convert CSV into JSON
bjester Oct 17, 2022
0356470
Merge pull request #3743 from bjester/translations-fixup
rtibbles Oct 17, 2022
7807c85
Fix i18n induced issues with learning activity icons.
rtibbles Oct 18, 2022
704285d
Resolve RTL dropdown issues
bjester Oct 19, 2022
21a778b
Merge pull request #3749 from rtibbles/i18nicons
bjester Oct 19, 2022
69264f0
Return empty string for class instead of null
bjester Oct 19, 2022
15b9629
Merge pull request #3756 from bjester/rtl-dropdowns
marcellamaki Oct 20, 2022
d4f2de2
Fix change errors not saving and skip errored or disallowed changes w…
bjester Oct 20, 2022
8ccff73
Resolve issues with handling of M/N values
bjester Oct 20, 2022
0f607d9
Allow learner_managed as null so it can be deleted
bjester Oct 20, 2022
59c3e83
Add demo server URL to catalog response
bjester Oct 21, 2022
22f4139
Learning Activity and Completion Criteria logic on when bulk editable
bjester Oct 21, 2022
a9c6e04
Merge pull request #3762 from bjester/demo-server-url
rtibbles Oct 24, 2022
bd43621
Merge pull request #3763 from bjester/bulk-allowed
rtibbles Oct 24, 2022
419991f
Merge pull request #3760 from bjester/learner-managed
rtibbles Oct 24, 2022
9a64872
Allow determined by resource to be stored as a value.
rtibbles Oct 24, 2022
b6e4324
Stop using the google storage API url in production to prevent CORS i…
rtibbles Oct 24, 2022
9462899
Merge pull request #3767 from rtibbles/determined_by_resource
marcellamaki Oct 24, 2022
0cb9091
Merge pull request #3768 from rtibbles/very_cross_about_the_origin
rtibbles Oct 25, 2022
dcf9422
Find unapplied changes and ensure we get updates from the backend abo…
rtibbles Oct 25, 2022
f29a11e
Don't reverse unAppliedChanges to ensure we get the earliest unapplie…
rtibbles Oct 25, 2022
4135adf
Merge pull request #3771 from rtibbles/not_applicable
marcellamaki Oct 25, 2022
b61e1d3
Update h5p and html model and threshold conditions
marcellamaki Oct 24, 2022
3ab75ec
Update max rev tracking to only look at client generated events.
rtibbles Oct 26, 2022
17467dd
Use visibility API to better detect when a user returns to a tab.
rtibbles Oct 26, 2022
d6519c4
Filter out server generated events in server side max rev calculations.
rtibbles Oct 26, 2022
f9c31aa
Updates to completion duration criteria to ensure data persistence. D…
marcellamaki Oct 27, 2022
29de82b
Remove required duration from exercises. Fix display of practice quizzes
marcellamaki Oct 27, 2022
61d2ea7
Update tests
marcellamaki Oct 27, 2022
0071088
Code cleanup and revert some (mistaken) changes
marcellamaki Oct 27, 2022
14c076d
Properly handle input from minutes, rather than setting default
marcellamaki Oct 27, 2022
4d45824
Merge pull request #3777 from marcellamaki/completion-duration-updates
rtibbles Oct 28, 2022
60f1528
Disable bulk editing of all new metadata types.
rtibbles Oct 28, 2022
12f4ff3
Do early return so we don't try to generate a thumbnail when we cannot.
rtibbles Oct 28, 2022
b8eb534
Merge pull request #3776 from rtibbles/one_less
marcellamaki Oct 28, 2022
e1a6e49
Ensure value for exact time duration is returned when duration dropdo…
marcellamaki Oct 28, 2022
a50d70a
Change completion criteria validation to ensure proper model for kind.
rtibbles Oct 28, 2022
7d6ef41
Still run full completion criteria validation when node is marked as …
rtibbles Oct 28, 2022
c2f957a
Harmonize frontend and backend sentry integrations.
rtibbles Oct 28, 2022
afc08b1
Update serializer tests to test complete contentnode serializer.
rtibbles Oct 29, 2022
afa6d24
Merge pull request #3780 from rtibbles/epubthumbnail
marcellamaki Oct 31, 2022
a986d25
Merge pull request #3782 from rtibbles/sentry
rtibbles Oct 31, 2022
5f30ee8
Fixes for completion criteria.
rtibbles Nov 1, 2022
302e361
Fix learner_managed getter.
rtibbles Nov 1, 2022
2293b7f
Set threshold for audio video types.
rtibbles Nov 1, 2022
111d4e3
Updates from review to reduce extraneous whitespace.
rtibbles Nov 1, 2022
e3a3b09
Always set mastery model for practice quizzes to do all.
rtibbles Nov 1, 2022
8c9b20f
Final completion criteria validation updates
marcellamaki Nov 1, 2022
cee4776
Merge pull request #3779 from rtibbles/learning_activity_bulk_edit
rtibbles Nov 1, 2022
897853f
Update gherkin scenarios
marcellamaki Nov 1, 2022
5447b69
Remove stray log
marcellamaki Nov 2, 2022
7dc7888
Move mark complete string into completion options.
rtibbles Nov 2, 2022
6923350
Clean up practice quiz helper function.
rtibbles Nov 2, 2022
783f9ff
Merge pull request #3781 from marcellamaki/more-completion-duration-u…
rtibbles Nov 2, 2022
985e9dd
Reverse changes to max rev logic.
rtibbles Nov 2, 2022
021dbb9
Make fetch blocking more targeted to allow fetches to happen while ot…
rtibbles Nov 2, 2022
3b0deaf
Exclude fetches when the parent has an unapplied tree affecting change.
rtibbles Nov 3, 2022
a3867b0
Merge pull request #3789 from rtibbles/copy_never_succeeds
rtibbles Nov 3, 2022
9df874e
Ensure info logs get sent to stdout
bjester Nov 4, 2022
1623098
Merge pull request #3796 from bjester/logging-stdout
marcellamaki Nov 4, 2022
5e44318
Do defaulting better to allow falsey values.
rtibbles Nov 7, 2022
72acf9e
Merge pull request #3801 from rtibbles/default_properly
marcellamaki Nov 7, 2022
a4ab06e
Use uniqBy and isEqual to do a deep comparison for uniqueifying compl…
rtibbles Nov 4, 2022
ace8bac
Flag non-unique value at the whole value level.
rtibbles Nov 4, 2022
b6d632f
Merge pull request #3798 from rtibbles/bulk_completion_criteria
marcellamaki Nov 7, 2022
509f98c
Prevents edge case where node extra fields could get modified during …
rtibbles Nov 9, 2022
f47e6ab
Merge pull request #3804 from rtibbles/no_modify_publish
rtibbles Nov 9, 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