Skip to content

Cascade latest release into develop#2946

Merged
rtibbles merged 147 commits intodevelopfrom
master
Feb 12, 2021
Merged

Cascade latest release into develop#2946
rtibbles merged 147 commits intodevelopfrom
master

Conversation

@rtibbles
Copy link
Copy Markdown
Member

@rtibbles rtibbles commented Feb 12, 2021

Description

Keep develop up to date with latest changes in production.

jayoshih and others added 30 commits January 15, 2021 13:32
@jayoshih
Added mark_incomplete to setup command
d63ef49
@micahscopes
Disable PWA manifest
6c53039
@rtibbles
Merge pull request #2810 from micahscopes/disable-pwa-manifest
b8a111e 
Disable PWA manifest
@jayoshih
Actually show no changes to review screen on staging page instead of …
dc0cae3 
…erroring out
@jayoshih
Merge branch 'hotfixes' of https://github.com/learningequality/studio …
ee746c3 
…into staging-fixes
@jayoshih
Merge branch 'master' of https://github.com/learningequality/studio i…
450d26d 
…nto staging-fixes
@jayoshih
Fixed permission checking on node diff endpoints
bad6b59
@rtibbles
Merge pull request #2804 from jayoshih/setup
b90a34a 
Added mark_incomplete to setup command
@jayoshih
Added deleted filter to settings channels
2b352f1
@jayoshih
Fixed typo in publish modal
1c020a1
@jayoshih
Switched order in which incomplete and uploading node validation mess…
158539d 
…ages are shown
@jayoshih
Make sure actions on resource panel don't get pushed offscreen
c41af83
@jayoshih
Merge pull request #2837 from jayoshih/settings-channels
24a32e8 
Added deleted filter to settings channels
@jayoshih
Merge pull request #2835 from jayoshih/staging-fixes
453d4f1 
Staging tree fixes
@jayoshih
Don't overwrite extra_fields data on updateContentNode
a8b3eb8
@jayoshih
Always show M/N fields on their own row and use labels instead of hints
04988c7
@MisRob
Update devsetup to the latest validation setup changes
b272a78
@rtibbles
Properly chunk complete=True updating.
be58db9 
Add chunking for operations that might otherwise hold a long table lock.
@rtibbles
Merge pull request #2840 from jayoshih/render-fix
e6546bc 
Make sure actions on resource panel don't get pushed offscreen
@rtibbles
Merge pull request #2808 from learningequality/develop
b73cee1 
Develop -> hotfixes
@bjester
Add PG advisory locking for MPTT tree ops
45566d9
@bjester
Remove print
433dded
@bjester
Fix concurrency test
9eb59e3
@bjester
Add comment
1f9ed8d
@bjester
Remove reference to Pipfile
dd089d4
@bjester
Fix arguments
f5416cb
@jayoshih
Use empty folder icon in topic tree hierarchy to reflect topics witho…
404eb79 
…ut resources
@rtibbles
Ensure that dropped connections do not disrupt task execution or sign…
36cec47 
…al handling.
@rtibbles
Use less aggressive connection refreshing to only catch cases where i…
4ba8afd 
…t is needed.
@MisRob
Merge pull request #2841 from jayoshih/mastery-fix
7c9226e 
Don't overwrite extra_fields data on updateContentNode
sairina and others added 25 commits February 4, 2021 19:58
@sairina
Hide the delete button from Channel Edit page
a83b71b
@MisRob
Do not validate license for topics
6313a98
@rtibbles
Merge pull request #2915 from MisRob/mark-incomplete-fix
b190d51 
Fix mark incomplete command for topics
@marcellamaki
simplify noSyncing work and update tests
d8fe718
@jonboiser
Add fallback value of ‘0’ when ‘border-left’ and ‘border-top’ strings…
cdfd96e 
… are empty

Fixes #2914
Fixes #2912
@jonboiser
Replace all usages of parseInt with safeParseInt
5519e2c
@rtibbles
Merge pull request #2916 from jonboiser/fix-pdf-on-ff
4934fbc 
Add fallback value of ‘0’ when ‘border-left/top’ style of a node is empty, during PDF generation
@micahscopes
Merge pull request #2910 from sairina/hide-delete
bb1d8e6 
Hide the "delete" option from Channel Edit page
@marcellamaki
no syncing should default to percentProgress 100 since the task is 'c…
9b28cb0 
…omplete'
@rtibbles
Add tests for activate_channel endpoint.
c83ee67 
Fix behaviour for tests.
@marcellamaki
add check current channel condition to isSyncing() and fix whitespace
bc8c766
@rtibbles
Merge pull request #2909 from marcellamaki/update-progress-modal
ce8dec1 
Update progress modal
@rtibbles
Merge pull request #2918 from rtibbles/no_double_counting
e0bbec6 
Fix activate channel endpoint behaviour
@bjester
Skip async server refresh for move/copy operations
60a8496
@bjester
Fix siblings sort before target node search
d169d90
@bjester
Update test
7401888
@bjester
Remove console.log
525f379
@bjester
Merge pull request #2901 from MisRob/move-modal-fixes
8e34c0e 
Nodes selection and move modal fixes
@rtibbles
Merge pull request #2921 from bjester/move-node-heisenbug
80dbcec 
Skips async refresh of local data for copy/move queries, and fixes sortBy finding new sort order
@rtibbles
Merge pull request #2923 from learningequality/hotfixes
7e6ba6f 
Release 2021-02-10
@jonboiser
Add guard when channel.accessible_languages is null
a9dc284
@rtibbles
Merge pull request #2929 from jonboiser/guard-null-accessibles_language
2fcca0f 
Add guard when `channel.accessible_languages` is `null`
@rtibbles
Use request.data instead of request.body to prevent RawPostDataExcept…
baf6bc7 
…ion.
@rtibbles
Merge pull request #2931 from rtibbles/activate_channel_body
d1a9de9 
Fix bug in activate_channel endpoint
@rtibbles
Merge pull request #2936 from learningequality/hotfixes
b8b095a 
Release 2021-02-11
@rtibbles rtibbles requested a review from bjester February 12, 2021 18:29
@rtibbles rtibbles merged commit 6cd38c6 into develop Feb 12, 2021
@MisRob MisRob mentioned this pull request Feb 17, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjester bjester bjester approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Studio: Frontend Tech Debt and KDS In...

Development

Successfully merging this pull request may close these issues.

9 participants

@rtibbles @bjester @jayoshih @micahscopes @MisRob @aronasorman @marcellamaki @sairina @jonboiser