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

Websockets merge unstable #4486

Open
wants to merge 853 commits into
base: websockets
Choose a base branch
from
Open
Changes from 61 commits
Commits
Show all changes
853 commits
Select commit Hold shift + click to select a range
224a05c
Refactor according to new model
ozer550 Aug 31, 2023
16787d9
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
1a62ea9
Merge pull request #4271 from learningequality/dependabot/github_acti…
rtibbles Sep 5, 2023
7814874
Merge pull request #4176 from vkWeb/copy-fail-handle
bjester Sep 5, 2023
5867823
Bump tibdex/github-app-token from 1 to 2
dependabot[bot] Sep 11, 2023
ebc48f7
make changes according to failing tests
ozer550 Sep 11, 2023
aa189a9
remove debug statements
ozer550 Sep 11, 2023
28c16e9
Fix missing attributes from change objects
vkWeb Sep 12, 2023
26b123d
Super Duper Fast Import Search :rocket:
vkWeb Sep 12, 2023
f64f8be
try fixing migrations
ozer550 Sep 13, 2023
e6de1a5
init appNexus the API Layer
akash5100 Sep 13, 2023
3809296
Rename module
akash5100 Sep 13, 2023
bc2e8b2
Removal of taskresult fields in migrations
ozer550 Sep 13, 2023
3fa10e3
Merge pull request #4278 from vkWeb/undefined_is_now_defined
rtibbles Sep 13, 2023
ba592bd
Merge pull request #4279 from vkWeb/super_fast_we_go
rtibbles Sep 13, 2023
b24c843
Merge pull request #4270 from learningequality/unstable
rtibbles Sep 14, 2023
c9c163c
Welcome AI Feature Flag
vkWeb Sep 18, 2023
cc48e86
the adapter class definitely needs a backend
akash5100 Sep 18, 2023
24da17a
Create proper migrations and fix failing tests
ozer550 Sep 21, 2023
390b705
fix comments
ozer550 Sep 21, 2023
2bafa33
increase sleep time for revoke
ozer550 Sep 21, 2023
2905dff
makes backendFactory abstract class
akash5100 Sep 21, 2023
084dc95
Bring back hasFeatureEnabled, rewrite tests
vkWeb Sep 21, 2023
aa90f57
Cleanup and ready :rocket:
vkWeb Sep 21, 2023
1f932f7
Fixes incorrectly truncated channel titles in 'Channel/source' and 'L…
akolson Sep 21, 2023
32bd214
Merge pull request #4288 from akolson/fix-incorrectly-truncated-chann…
marcellamaki Sep 22, 2023
87b5413
Merge pull request #4283 from vkWeb/welcome_ai
akolson Sep 22, 2023
ab00a58
Merge pull request #4282 from akash5100/new-api-layer
akolson Sep 22, 2023
bfb33da
Bump gevent from 21.12.0 to 23.9.1
dependabot[bot] Sep 25, 2023
46caea9
add caching for model retrieval
ozer550 Sep 26, 2023
137db5d
Changed the router-link tag to KrouterLink
ShivangRawat30 Sep 26, 2023
3f9a853
remove as_dict method
ozer550 Sep 26, 2023
dbe7c04
Add instance ID to public API
bjester Sep 27, 2023
c2843ba
Merge pull request #4298 from bjester/add-instance-id
bjester Sep 27, 2023
88a6160
Moves appnexus to automation app
akolson Sep 28, 2023
01919b2
Moves appnexus to automation app
akolson Sep 28, 2023
5ae448b
adds Recommendations backend boilerplate class
akolson Sep 28, 2023
2d7058e
Merge pull request #4300 from akolson/move-appnexus-to-automation
akolson Sep 28, 2023
051968a
updates test
akolson Sep 28, 2023
ea5396a
Refactors file locations
akolson Sep 28, 2023
608be48
Refactors boilerplate
akolson Sep 28, 2023
af36041
Updates branch with latest dev changes
akolson Sep 28, 2023
ba921bd
Refactors boilerplate
akolson Sep 28, 2023
3d8cf19
updates typo in factory class
akolson Sep 29, 2023
7a19729
Refactors boilerplate to remove ambiguity
akolson Sep 29, 2023
109ca3c
Merge pull request #4301 from akolson/add-recommendations-backend-boi…
akolson Sep 29, 2023
33060af
Adds whisper backend
akash5100 Sep 29, 2023
d50294b
Merge pull request #4305 from akash5100/whisper-backend
akolson Sep 29, 2023
e08afd6
add automation_manager class and tests
ozer550 Oct 3, 2023
7d8101b
Merge pull request #4293 from ShivangRawat30/KRouterLink
MisRob Oct 6, 2023
a5475b5
use backend factory to create backend
ozer550 Oct 6, 2023
81cf6e3
add cloud_storage_backend and tests
ozer550 Oct 9, 2023
37b54f5
Merge pull request #4309 from ozer550/add-cloudstorage-backend-boiler…
akolson Oct 10, 2023
a21fe48
fix miss spellings
ozer550 Oct 11, 2023
6ae8aca
Merge pull request #4306 from ozer550/Manager_Class_Appnexus
akolson Oct 11, 2023
c2d81a2
Bump @babel/traverse from 7.18.2 to 7.23.2
dependabot[bot] Oct 18, 2023
a85db42
Merge pull request #4312 from learningequality/dependabot/npm_and_yar…
rtibbles Oct 20, 2023
bb5e309
Merge pull request #4274 from learningequality/dependabot/github_acti…
rtibbles Oct 20, 2023
1b67595
Merge pull request #4254 from learningequality/dependabot/pip/tornado…
rtibbles Oct 20, 2023
2d6b8e4
Merge pull request #4240 from learningequality/dependabot/npm_and_yar…
rtibbles Oct 20, 2023
9f648a1
Merge pull request #4226 from learningequality/dependabot/pip/django-…
rtibbles Oct 20, 2023
faf649b
Merge pull request #4269 from learningequality/dependabot/npm_and_yar…
rtibbles Oct 20, 2023
50ef870
Bump pygments from 2.7.4 to 2.15.0
dependabot[bot] Oct 20, 2023
cbb1345
Merge pull request #4291 from learningequality/dependabot/pip/gevent-…
rtibbles Oct 20, 2023
92454c4
Merge pull request #4237 from learningequality/dependabot/pip/pygment…
rtibbles Oct 20, 2023
09ea961
refactor: move sigil download logic to a separate script
Oct 22, 2023
87372ec
Bump i18n-iso-countries from 7.6.0 to 7.7.0
dependabot[bot] Oct 23, 2023
c4491ce
Bump actions/setup-node from 3 to 4
dependabot[bot] Oct 24, 2023
6fe058f
Fix misalignment of copy failure retry
KshitijThareja Oct 30, 2023
aef05d0
Merge pull request #4268 from ozer550/fix_celery_race_condition
bjester Oct 30, 2023
78b2a0c
Remove extra space from channel menu
KshitijThareja Oct 31, 2023
f629d27
Merge pull request #4320 from KshitijThareja/4087
bjester Oct 31, 2023
e71e478
Change alignment of retry button
KshitijThareja Oct 31, 2023
b3b43ac
Merge pull request #4319 from KshitijThareja/4272
bjester Oct 31, 2023
c899ab8
Bump django from 3.2.19 to 3.2.23
dependabot[bot] Nov 2, 2023
ff37147
Merge pull request #4324 from learningequality/dependabot/pip/django-…
vkWeb Nov 3, 2023
319789b
fix the incorrect retrival qurey
ozer550 Nov 6, 2023
96235fa
optimise the database query by using RAW sql
ozer550 Nov 7, 2023
44b4a56
remove two joins from the raw sql query
ozer550 Nov 7, 2023
bbb88af
Fix referencing
ozer550 Nov 7, 2023
3a876e6
use djnago_cte to create the join query
ozer550 Nov 9, 2023
4ad62f5
Run linting
ozer550 Nov 9, 2023
a391e23
fix failing tests
ozer550 Nov 9, 2023
880567d
Merge pull request #4333 from ozer550/fix-return-task-function
bjester Nov 9, 2023
823b01c
Bump axios from 1.4.0 to 1.6.2
dependabot[bot] Nov 15, 2023
f61442e
fix: increase timeout on reading upstream studio server responses
Nov 10, 2023
6ccb9a9
chore: upgrade nginx to 1.25
Nov 17, 2023
35321d9
Merge pull request #4336 from aronasorman/fix-timeout
aronasorman Nov 19, 2023
ae1f6c4
Move docs from readme to docs dir
MisRob Nov 21, 2023
d05b383
Add contributing guidelines
MisRob Nov 25, 2023
c809bd1
Add contact links to the new issue template
MisRob Nov 27, 2023
7230cc9
Add a note about recommended setup
MisRob Nov 28, 2023
da38913
Add a note about recommended setup to index
MisRob Nov 28, 2023
1974bfb
Merge pull request #4345 from MisRob/contributing-docs
MisRob Nov 28, 2023
42ba0f3
Bump @adobe/css-tools from 4.3.1 to 4.3.2
dependabot[bot] Dec 1, 2023
383985a
Merge pull request #4346 from learningequality/dependabot/npm_and_yar…
rtibbles Dec 6, 2023
6057735
Merge pull request #4340 from learningequality/dependabot/npm_and_yar…
rtibbles Dec 6, 2023
38e62ee
Merge pull request #4317 from learningequality/dependabot/github_acti…
rtibbles Dec 6, 2023
25a3abd
Merge pull request #4315 from learningequality/dependabot/npm_and_yar…
rtibbles Dec 6, 2023
b98f4b9
Bump actions/setup-python from 4 to 5
dependabot[bot] Dec 7, 2023
525b7db
Merge pull request #4348 from learningequality/dependabot/github_acti…
rtibbles Dec 7, 2023
99324e9
issue number 2074 resolved
cerdo03 Dec 7, 2023
eb36e5f
changes as suggested by the maintainers
cerdo03 Dec 12, 2023
520abf1
fixed checkbox issue
cerdo03 Dec 14, 2023
9bfe1de
lint tests
cerdo03 Dec 14, 2023
b3e2902
Update dependabot.yml to weekly cadence.
rtibbles Dec 15, 2023
b00899a
Merge branch 'unstable' of github.com:cerdo03/studio into checkbox-is…
cerdo03 Dec 16, 2023
191d32a
Merge branch 'unstable' of github.com:cerdo03/studio into issues-fix-…
cerdo03 Dec 17, 2023
9bafc01
lint test
cerdo03 Dec 17, 2023
3fe2b57
Initial GH workflow (testing)
bjester Dec 18, 2023
f18064f
Set image tag to ghcr.io
bjester Dec 18, 2023
acc8900
Merge pull request #4362 from bjester/pg-vector-workflow
bjester Dec 18, 2023
e6d895e
Disable skip after success, b/c push skip on PR
bjester Dec 18, 2023
9643af3
Merge pull request #4363 from bjester/pg-vector-workflow
bjester Dec 18, 2023
31bc6e7
Attempt to fix manifest issue
bjester Dec 18, 2023
22e99e8
Fix issue with image in wrong place
bjester Dec 18, 2023
bfef832
Merge pull request #4364 from bjester/move-image
bjester Dec 18, 2023
7621017
Merge pull request #4358 from cerdo03/checkbox-issue-4352
bjester Dec 19, 2023
9264d38
Fix wrong computed prop name
vkWeb Dec 23, 2023
94fa821
Changed IconButton to KRouterLink
BabyElias Dec 29, 2023
7dd8b04
Updated to KRouter Link
BabyElias Dec 29, 2023
052b5a9
[fix] Import applied language filter
FidalMathew Jan 3, 2024
ee27e29
Fix node availability when propogating import
vkWeb Jan 4, 2024
57bdac7
Merge pull request #4371 from vkWeb/filter-filter
bjester Jan 4, 2024
358b57d
Merge pull request #4379 from learningequality/hotfixes
vkWeb Jan 4, 2024
4721638
Bump kolibri-constants from 0.1.42 to 0.2.0
dependabot[bot] Jan 5, 2024
4b0015f
Bump pillow from 9.4.0 to 10.2.0
dependabot[bot] Jan 5, 2024
21327c7
Merge pull request #4380 from learningequality/dependabot/npm_and_yar…
rtibbles Jan 5, 2024
d16b50b
add languageFilter event
FidalMathew Jan 6, 2024
30ca0af
fix naming
FidalMathew Jan 7, 2024
beaf376
Bump fonttools from 4.40.0 to 4.43.0
dependabot[bot] Jan 9, 2024
29e35bb
Fixed Linting issues
BabyElias Jan 9, 2024
03921ae
Merge pull request #4388 from learningequality/dependabot/pip/fonttoo…
rtibbles Jan 10, 2024
30f7905
Bump follow-redirects from 1.15.2 to 1.15.4
dependabot[bot] Jan 10, 2024
a6d6074
Bump urllib3 from 1.26.14 to 1.26.18
dependabot[bot] Jan 10, 2024
4ee52ed
Merge pull request #4390 from learningequality/dependabot/npm_and_yar…
rtibbles Jan 10, 2024
cbfa811
Upgrade to python 3.10
Jovian-Dsouza Jan 6, 2024
a506b79
fix languages bug
FidalMathew Jan 10, 2024
cd1f158
Merge pull request #4391 from learningequality/dependabot/pip/urllib3…
rtibbles Jan 10, 2024
3953acd
Made required changes
BabyElias Jan 10, 2024
b1a2da8
Changes required
BabyElias Jan 11, 2024
f5d6319
Minor logic refactor
vkWeb Jan 11, 2024
4dde334
Merge pull request #4376 from FidalMathew/my-hotfixes
vkWeb Jan 11, 2024
2f5ba54
Merge pull request #4393 from learningequality/hotfixes
bjester Jan 11, 2024
7cd3468
Merge pull request #4350 from cerdo03/issues-fix-surya
bjester Jan 11, 2024
13c143f
Merge pull request #4374 from BabyElias/Issue-#219--Kolibri-Design-Sy…
nucleogenesis Jan 11, 2024
8e8fce1
Bump core-js from 3.25.1 to 3.35.0
dependabot[bot] Jan 12, 2024
f677994
Changed components to KComponents
BabyElias Jan 14, 2024
add85c5
fix for linting errors
BabyElias Jan 14, 2024
a403af1
fix:scroller
nick2432 Jan 16, 2024
e2c9762
admin-panel collection error resolved
GarvitSinghal47 Jan 16, 2024
6d44104
Merge pull request #4400 from nick2432/fix-scroller
LianaHarris360 Jan 16, 2024
601ddc0
Merge pull request #4384 from Jovian-Dsouza/upgrade_python
rtibbles Jan 17, 2024
4e70d35
add reference and scroll in EditView
FidalMathew Jan 18, 2024
fe6ff5c
fix bug
FidalMathew Jan 18, 2024
f02a304
Merge pull request #4377 from vkWeb/import-peace
bjester Jan 18, 2024
79d8100
Bump the github group with 1 update
dependabot[bot] Jan 19, 2024
d45dae5
Merge pull request #4407 from learningequality/dependabot/github_acti…
rtibbles Jan 20, 2024
a963480
fix minor bugs
FidalMathew Jan 20, 2024
6ba65d1
translate fields
FidalMathew Jan 20, 2024
bf525ca
Merge pull request #4396 from learningequality/dependabot/npm_and_yar…
rtibbles Jan 20, 2024
e71c647
Merge branch 'learningequality:unstable' into Issue-#219--Kolibri-Des…
BabyElias Jan 21, 2024
15683eb
required changes
BabyElias Jan 21, 2024
2612c41
Fix removed constant reference.
rtibbles Jan 22, 2024
f2421b6
Merge pull request #4383 from learningequality/dependabot/pip/pillow-…
rtibbles Jan 22, 2024
d1e0621
Remove unused minio launching script.
rtibbles Jan 22, 2024
b626ed3
Remove unused dependencies.
rtibbles Jan 22, 2024
7bb08d1
Upgrade Studio to KDS 3.0.0 (1/3)
MisRob Jan 22, 2024
a4303ed
Upgrade Studio to KDS 3.0.0 (2/3)
MisRob Jan 22, 2024
0311c02
Upgrade Studio to KDS 3.0.0 (3/3)
MisRob Jan 22, 2024
fb7ccbb
Merge pull request #4398 from BabyElias/Issue-#219--Kolibri-Design-Sy…
akolson Jan 22, 2024
832a0be
Updated Components to KComponents
BabyElias Jan 22, 2024
1e82c5e
double submit issue resolved
GarvitSinghal47 Jan 24, 2024
cd70492
Merge pull request #4404 from FidalMathew/issue-2924
AlexVelezLl Jan 24, 2024
081fa49
update django_bulk_update with inbuilt bulk_update
FidalMathew Jan 25, 2024
782f731
fix: remove django_bulk_update
FidalMathew Jan 25, 2024
6bb716d
Merge branch 'learningequality:unstable' into Issue-#219--Kolibri-Des…
BabyElias Jan 26, 2024
80feb39
updated trash icon
BabyElias Jan 26, 2024
6ee12dd
Merge pull request #4410 from rtibbles/unused_prod_dependencies
bjester Jan 26, 2024
f1d6d33
fix bug
FidalMathew Jan 27, 2024
e9f6468
add empty array check
FidalMathew Jan 27, 2024
7e42f3a
staging error resolved
GarvitSinghal47 Jan 28, 2024
e9bb7b7
Linting error resolved
GarvitSinghal47 Jan 30, 2024
99afff7
error resolved
GarvitSinghal47 Jan 30, 2024
fa6b039
Merge pull request #4413 from BabyElias/Issue-#219--Kolibri-Design-Sy…
akolson Jan 30, 2024
d8779c2
Merge pull request #4414 from GarvitSinghal47/Double-Submit-error
LianaHarris360 Jan 30, 2024
b9fafed
queryset improved for dev
GarvitSinghal47 Jan 31, 2024
6dbbabe
sorting in channels added
GarvitSinghal47 Jan 31, 2024
8837efd
Merge pull request #4422 from GarvitSinghal47/staging-error
bjester Jan 31, 2024
4e568fb
fix: on download_sigil.sh, make sure we exit if any command
Nov 22, 2023
17d435c
fix: on download_sigil.sh, use the arch format used by the project's …
Nov 22, 2023
1fe6587
tests: run nginx on port 8081. Used for testing builds for now
Nov 22, 2023
50af4f7
tests: create a new github action that builds the nginx image as a sm…
Nov 22, 2023
a90c530
Combine container builds into single workflow
bjester Jan 31, 2024
e51add4
Merge pull request #4343 from aronasorman/fix-timeout
bjester Jan 31, 2024
6bd81d4
Merge pull request #4412 from MisRob/kds-upgrade-stable
marcellamaki Jan 31, 2024
0165804
fix assessment_item_fields bug
FidalMathew Feb 2, 2024
0d5a44a
revert changes and annotation error removed
GarvitSinghal47 Feb 2, 2024
b20b754
suggested changes done
GarvitSinghal47 Feb 2, 2024
9180549
Merge pull request #4417 from FidalMathew/issue-4409
bjester Feb 2, 2024
5660842
icon added
GarvitSinghal47 Feb 3, 2024
9d40265
Enhance branch isolation
GarvitSinghal47 Feb 3, 2024
54e82e7
Merge pull request #4401 from GarvitSinghal47/error-channel-collection
ozer550 Feb 6, 2024
f68220d
Bump django from 3.2.23 to 3.2.24
dependabot[bot] Feb 7, 2024
5998492
Merge pull request #4429 from learningequality/dependabot/pip/django-…
rtibbles Feb 9, 2024
933a134
Add user email to storage request
Feb 9, 2024
6a156ae
Merge branch 'unstable' of https://www.github.com/Abhishekzod007/stud…
Abhishekzod007 Feb 9, 2024
6514199
Bump grpcio from 1.53.0 to 1.53.2
dependabot[bot] Feb 11, 2024
6d0e254
Merge pull request #4435 from learningequality/dependabot/pip/grpcio-…
rtibbles Feb 11, 2024
676b984
Install npm KDS package
MisRob Feb 14, 2024
8fc40ad
Fix kds inputs outlines
AlexVelezLl Feb 15, 2024
f4cf7f4
Merge pull request #4443 from AlexVelezLl/fix-checkbox-outline
AlexVelezLl Feb 16, 2024
578a2c5
upgrade le-utils
Feb 21, 2024
0c36256
Add action to notify us on Slack about GH issues comments
MisRob Feb 22, 2024
660229e
Bump stylus from 0.59.0 to 0.62.0
dependabot[bot] Feb 23, 2024
da6f686
Use toJSON
MisRob Feb 23, 2024
6ff70b8
Merge pull request #4452 from learningequality/dependabot/npm_and_yar…
rtibbles Feb 24, 2024
d26bb2e
Bump ip from 1.1.8 to 1.1.9
dependabot[bot] Feb 24, 2024
d3362b3
Merge pull request #4445 from learningequality/dependabot/npm_and_yar…
rtibbles Feb 24, 2024
25c0c8e
Bump es5-ext from 0.10.61 to 0.10.63
dependabot[bot] Feb 27, 2024
f4898d9
Merge pull request #4427 from GarvitSinghal47/branch_isolation
bjester Feb 27, 2024
14c3227
Update yarn.lock
bjester Feb 28, 2024
6763471
Merge pull request #4441 from MisRob/kds-npm
bjester Feb 28, 2024
4e26086
Update KDS to v3.0.1
MisRob Feb 29, 2024
10d0868
Configure dependabot to run on Wednesday
MisRob Feb 29, 2024
c36a1c4
Fix the action
MisRob Mar 4, 2024
9291863
Merge pull request #4460 from MisRob/upgrade-kds-v301
bjester Mar 5, 2024
76a5b93
Bump dexie from 3.2.4 to 3.2.6
dependabot[bot] Mar 5, 2024
91dfec0
Merge pull request #4449 from MisRob/slack-notification
MisRob Mar 6, 2024
c6d08bc
Add defaultWidth prop to ResizableNavigationDrawer
Abhishekzod007 Mar 10, 2024
cc2828a
Merge branch 'unstable' of https://www.github.com/Abhishekzod007/stud…
Abhishekzod007 Mar 10, 2024
6496a23
Merge pull request #4465 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 12, 2024
eeaf838
Fix lint issue in ResizableNavigationDrawer
Abhishekzod007 Mar 12, 2024
5c0d00a
Merge pull request #4436 from Abhishekzod007/patch_navbarwidth
bjester Mar 12, 2024
d2f0481
Bump broadcast-channel from 5.1.0 to 7.0.0
dependabot[bot] Mar 13, 2024
7f83d52
Merge branch 'unstable' into sort-functionality
bjester Mar 13, 2024
33e8fce
Update to KIconButton
bjester Mar 13, 2024
77245bd
Merge pull request #4423 from GarvitSinghal47/sort-functionality
bjester Mar 13, 2024
131b776
Merge pull request #4457 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 16, 2024
a375742
Bump follow-redirects from 1.15.4 to 1.15.6
dependabot[bot] Mar 16, 2024
a5afa7d
Merge pull request #4474 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 16, 2024
12e0318
Bump autoprefixer from 9.8.8 to 10.4.18
dependabot[bot] Mar 20, 2024
8bf494f
Merge pull request #4476 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 20, 2024
9ff1313
Cleanup unused broadcast-channel dependency.
rtibbles Mar 22, 2024
8a928bb
Merge pull request #4473 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 22, 2024
1c9c8d4
Bump webpack-dev-middleware from 5.3.3 to 5.3.4
dependabot[bot] Mar 22, 2024
5129510
Update migrations for le-utils upgrade.
rtibbles Mar 22, 2024
8c3d74d
Merge pull request #4483 from learningequality/dependabot/npm_and_yar…
rtibbles Mar 22, 2024
6e3be57
Merge pull request #4444 from jredrejo/upgrade_le_utils
rtibbles Mar 22, 2024
b0af9fd
Merge branch 'unstable' into websockets
rtibbles Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@ updates:
directory: "/"
schedule:
interval: "weekly"
day: "friday"
day: "wednesday"
time: "00:00"

# Maintain dependencies for Javascript
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
day: "friday"
day: "wednesday"
time: "00:00"
groups:
babel:
@@ -28,7 +28,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
day: "friday"
day: "wednesday"
time: "00:00"
groups:
github:
46 changes: 42 additions & 4 deletions .github/workflows/containerbuild.yml
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ on:
pull_request:

jobs:
pre_job:
name: Path match check
pre_postgres:
name: Path match check - postgres
runs-on: ubuntu-latest
# Map a step output to a job output
outputs:
@@ -24,10 +24,11 @@ jobs:
skip_after_successful_duplicate: false
github_token: ${{ github.token }}
paths: '["docker/Dockerfile.postgres.dev", ".github/workflows/containerbuild.yml"]'

build_and_push_postgres:
name: Postgres - build and push Docker image to GitHub Container Registry
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
needs: pre_postgres
if: ${{ needs.pre_postgres.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
@@ -65,3 +66,40 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
annotations: ${{ steps.meta.outputs.annotations }}

pre_nginx:
name: Path match check - nginx
runs-on: ubuntu-latest
# Map a step output to a job output
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@master
with:
skip_after_successful_duplicate: false
github_token: ${{ github.token }}
paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'

build_nginx:
name: nginx - test build of nginx Docker image
needs: pre_nginx
if: ${{ needs.pre_nginx.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: ./
file: ./k8s/images/nginx/Dockerfile
platforms: linux/amd64
push: false
35 changes: 35 additions & 0 deletions .github/workflows/notify_team_new_comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Send a slack notification when a contributor comments on issue

on:
issue_comment:
types: [created]

jobs:
contributor_issue_comment:
name: Contributor issue comment

if: >-
${{
!github.event.issue.pull_request &&
github.event.comment.author_association != 'MEMBER' &&
github.event.comment.author_association != 'OWNER'
}}

runs-on: ubuntu-latest
steps:
- name: Escape title double quotes
id: escape_title
run: |
title='${{ github.event.issue.title }}'
echo "ISSUE_TITLE=${title//\"/\\\"}" >> "$GITHUB_OUTPUT"

- name: Send message to Slack channel
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
uses: slackapi/slack-github-action@v1.25.0
with:
payload: |
{
"text": "*[Studio] New comment on issue: <${{ github.event.issue.html_url }}#issuecomment-${{ github.event.comment.id }}|${{ steps.escape_title.outputs.ISSUE_TITLE }} by ${{ github.event.comment.user.login }}>*"
}
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -136,7 +136,9 @@ dummyusers:
hascaptions:
python contentcuration/manage.py set_orm_based_has_captions

export COMPOSE_PROJECT_NAME=studio_$(shell git rev-parse --abbrev-ref HEAD)
BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[^a-zA-Z0-9_-]/-/g')

export COMPOSE_PROJECT_NAME=studio_$(BRANCH_NAME)

purge-postgres: .docker/pgpass
-PGPASSFILE=.docker/pgpass dropdb -U learningequality "kolibri-studio" --port 5432 -h localhost
Original file line number Diff line number Diff line change
@@ -50,6 +50,7 @@
app
style="height: calc(100% - 64px);"
:minWidth="150"
:defaultWidth="250"
:maxWidth="500"
@scroll="scroll"
>
Original file line number Diff line number Diff line change
@@ -98,7 +98,13 @@
</ToolBar>

<VLayout class="main-content">
<VFlex v-if="!children.length" class="pa-4 subheading text-xs-center">
<VFlex v-if="isLoadingchild" class="pa-4 subheading text-xs-center">
<KCircularLoader />
</VFlex>
<VFlex
v-else-if="!children.length && !isLoadingchild"
class="pa-4 subheading text-xs-center"
>
{{ $tr('emptyTopicText') }}
</VFlex>
<div v-else class="main-list" @scroll="scroll">
@@ -291,6 +297,7 @@
},
data() {
return {
isLoadingchild: false,
isLoading: true,
displaySummaryDetailsDialog: false,
displayDeployDialog: false,
@@ -387,8 +394,14 @@
watch: {
nodeId(newNodeId) {
this.elevated = false;
this.loadAncestors({ id: newNodeId });
this.loadChildren({ parent: newNodeId, root_id: this.stagingId });
this.isLoadingchild = true;

Promise.all([
this.loadAncestors({ id: newNodeId }),
this.loadChildren({ parent: newNodeId, root_id: this.stagingId }),
]).then(() => {
this.isLoadingchild = false;
});
},
detailNodeId(newDetailNodeId) {
if (!newDetailNodeId) {
Original file line number Diff line number Diff line change
@@ -93,23 +93,23 @@
:to="channelDetailsLink"
>

<IconButton
<KIconButton
:color="$themeTokens.primary"
data-test="details-button"
class="mr-1"
icon="info"
:text="$tr('details')"
:tooltip="$tr('details')"
@mouseenter.native="hideHighlight = true"
@mouseleave.native="hideHighlight = false"
/>

</KRouterLink>

<IconButton
<KIconButton
v-if="!allowEdit && channel.published"
class="mr-1"
icon="copy"
:text="$tr('copyToken')"
:tooltip="$tr('copyToken')"
data-test="token-button"
@click.stop.prevent="tokenDialog = true"
@mouseenter.native="hideHighlight = true"
@@ -145,7 +145,10 @@
@click.stop
>
<VListTileAvatar>
<Icon>edit</Icon>
<KIconButton
disabled="true"
icon="edit"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('editChannel') }}</VListTileTitle>
</VListTile>
@@ -155,7 +158,10 @@
@click="tokenDialog = true"
>
<VListTileAvatar>
<Icon>content_copy</Icon>
<KIconButton
disabled="true"
icon="copy"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('copyToken') }}</VListTileTitle>
</VListTile>
@@ -190,7 +196,10 @@
@click.stop="deleteDialog = true"
>
<VListTileAvatar>
<Icon>delete</Icon>
<KIconButton
disabled="true"
icon="trash"
/>
</VListTileAvatar>
<VListTileTitle>{{ $tr('deleteChannel') }}</VListTileTitle>
</VListTile>
@@ -232,15 +241,13 @@
import ChannelTokenModal from 'shared/views/channel/ChannelTokenModal';
import Thumbnail from 'shared/views/files/Thumbnail';
import Languages from 'shared/leUtils/Languages';
import IconButton from 'shared/views/IconButton';

export default {
name: 'ChannelItem',
components: {
ChannelStar,
ChannelTokenModal,
Thumbnail,
IconButton,
},
props: {
channelId: {
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

<!-- Adding div wrapper as tests fail when VTooltip is the root -->
<div style="display: inline-block;">
<IconButton
<KIconButton
data-test="button"
:icon="bookmark ? 'star' : 'starBorder'"
:text="starText"
:tooltip="starText"
v-bind="$attrs"
@click="toggleStar"
/>
@@ -16,13 +16,10 @@
<script>

import { mapActions, mapGetters } from 'vuex';
import IconButton from 'shared/views/IconButton';

export default {
name: 'ChannelStar',
components: {
IconButton,
},

props: {
channelId: {
type: String,
Original file line number Diff line number Diff line change
@@ -192,6 +192,7 @@
changed: false,
showUnsavedDialog: false,
diffTracker: {},
saving: false,
};
},
computed: {
@@ -316,6 +317,10 @@
this.title = this.isNew ? this.$tr('creatingChannelSet') : this.channelSet.name;
},
save() {
if (this.saving) {
return;
}
this.saving = true;
this.showUnsavedDialog = false;
if (this.$refs.channelsetform.validate()) {
let promise;
@@ -326,7 +331,13 @@
return this.updateChannelSet({ id: this.channelSetId, ...this.diffTracker });
});
}
promise.then(this.close);
promise
.then(() => {
this.close();
})
.finally(() => {
this.saving = false;
});
}
},
cancelChanges() {
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@
v-for="affiliation in affiliationOptions"
:key="affiliation.value"
v-model="org_or_personal"
:value="affiliation.value"
:buttonValue="affiliation.value"
:invalid="errors.org_or_personal"
:showInvalidText="errors.org_or_personal"
:invalidText="$tr('fieldRequiredText')"
@@ -172,7 +172,7 @@
v-for="orgType in organizationTypeOptions"
:key="orgType.value"
v-model="organization_type"
:value="orgType.value"
:buttonValue="orgType.value"
:invalid="errors.organization_type"
:showInvalidText="errors.organization_type"
:invalidText="$tr('fieldRequiredText')"
@@ -199,7 +199,7 @@
v-for="constraint in timeConstraintOptions"
:key="constraint.value"
v-model="time_constraint"
:value="constraint.value"
:buttonValue="constraint.value"
:label="constraint.text"
/>

2 changes: 2 additions & 0 deletions contentcuration/contentcuration/frontend/shared/app.js
Original file line number Diff line number Diff line change
@@ -108,6 +108,7 @@ import VueIntl from 'vue-intl';
import Croppa from 'vue-croppa';
import { Workbox, messageSW } from 'workbox-window';
import KThemePlugin from 'kolibri-design-system/lib/KThemePlugin';
import trackInputModality from 'kolibri-design-system/lib/styles/trackInputModality';

import AnalyticsPlugin from './analytics/plugin';
import { theme, icons } from 'shared/vuetify';
@@ -305,6 +306,7 @@ function initiateServiceWorker() {
export let rootVue;

export default async function startApp({ store, router, index }) {
trackInputModality();
await initiateServiceWorker();
await initializeDB();
await i18nSetup();
Loading