Skip to content

Hotfixes release for last 2 sprints ending 2021-07-06 - #3224

Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged

Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom
bjester:sprint-release-2021-07-06

Conversation

@bjester

@bjesterbjester commented Jul 6, 2021•
edited
Loading

Copy link
Copy Markdown
Member

Summary

  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A

QA Scenarios

Sign-in page

  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully

Sign-in connectivity

  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully

Upload resources

  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource

Merge conflicts

diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;

micahscopesand others added 27 commits May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester changed the title Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester marked this pull request as ready for review July 7, 2021 17:43
@bjester
bjester requested a review from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles merged commit 5572799 into learningequality:hotfixesJul 7, 2021
@bjesterbjester mentioned this pull request Jul 7, 2021
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Hotfixes release for last 2 sprints ending 2021-07-06 by bjester · Pull Request #3224 · learningequality/studio · GitHub
Skip to content
Hotfixes release for last 2 sprints ending 2021-07-06 - #3224
Merged
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Jul 7, 2021
Merged
Hotfixes release for last 2 sprints ending 2021-07-06#3224
rtibbles merged 27 commits into
learningequality:hotfixesfrom 
bjester:sprint-release-2021-07-06
Conversation
@bjester
@bjesterbjester
commented
Jul 6, 2021•

edited

Loading

Copy link


Copy Markdown

Member
Summary
  • Adds enhanced offline status presentation on sign-in page
  • Adds metadata for new resource types, including .zim files
  • Eliminates unresolvable errors when syncing deletion event for resources already deleted
  • Security updates and deepsource fixes
  • (dev) Adds alias for yarn command
  • (dev) Automatic linting fixes in GH workflows
PRIssueCategoryQA Focus
#2940#2938Enhancement/Bug fixSign-in page
Sign-in connectivity
#3216EnhancementUpload resources
Chef .zim file
#3179Dev enchancementN/A
#3217Dev enchancementN/A
#3204#3203Bug fixDelete a resource
#3192Security updateN/A
#3194Security updateN/A
#3213Tech debtN/A
#3214Tech debtN/A
#3218Tech debtN/A
QA Scenarios
Sign-in page
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Verify it renders acceptably
  4. Sign in
  5. Verify you're signed in successfully
Sign-in connectivity
  1. Be signed out of studio
  2. Open the Studio sign-in page
  3. Disable your internet connection (or use dev tools to emulate offline)
  4. Verify you see a message regarding being offline
  5. Verify sign-in is disabled
  6. Reconnect your internet
  7. Verify you can sign in successfully
Upload resources
  1. Open an editable channel
  2. Click ADD and select Upload files
  3. Upload a resource
  4. Finalize the details of the resource
  5. Add any additional files like thumbnails or subtitles
  6. Verify everything is saved and functions as expected
  7. Repeat for a different type of supported resource
Merge conflicts
diff --cc contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index cff562b4c,5ec186d1a..000000000
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue@@@ -138,9 -128,7 +138,13 @@@
};
return this.login(credentials)
.then(() => {
++<<<<<<< HEAD
+ this.loginFailedOffline = false;
+ this.loginFailed = false;
+ window.location.assign(this.nextParam || '/channels');
++=======+ window.location.assign(this.nextParam || window.Urls.channels());++>>>>>>> hotfixes
})
.catch(err => {
this.busy = false;
micahscopesand others
added 27 commits
May 21, 2021 10:50
@micahscopes
allow custom offline status text
c2966e6
@micahscopes
preliminary offline status and connection error messages during regis…
70b021d
…tration
@micahscopes
Disable signup finish button when offline
efa7714
@micahscopes
Mock vuex state in signup tests
856dffe
@rtibbles
Alias devserver-hot to devserver:hot to reduce annoyance.
0a4979f
@rtibbles
Merge pull requestlearningequality#3179from rtibbles/qol
da5a667
Alias devserver-hot to devserver:hot to reduce annoyance.
@dependabot
Bump pillow from 8.1.1 to 8.2.0
3bbb9ef
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.1.1...8.2.0)
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@micahscopes
Tweak offline account creation message
3f090d3
@micahscopes
Merge pull requestlearningequality#2940from micahscopes/offline-sig…
f0f0158
…nin-and-registration-errors
Offline sign-in and registration error messages
@rtibbles
Don't error if trying to delete a contentnode that doesn't exist.
a6c914d
@bjester
Merge pull requestlearningequality#3204from rtibbles/delete_not_found
d41f805
Don't error if trying to delete a contentnode that doesn't exist.
@bjester
Merge pull requestlearningequality#3192from learningequality/depend…
a466d48
…abot/pip/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0
@rtibbles
Create .deepsource.toml
eea6ba2
@deepsource-autofix
Remove return from __init__() method
9a7088d
@deepsource-autofix
Fix dangerous default argument
a575897
@rtibbles
Merge pull requestlearningequality#3213from learningequality/deepso…
a7e660d
…urce-fix-f445bf4c
Remove `return` from `__init__()` method
@rtibbles
Merge pull requestlearningequality#3214from learningequality/deepso…
844f2ac
…urce-fix-9db7f9d1
Fix dangerous default argument
@rtibbles
Push automated code fixes.
758543c
@deepsource-autofix
Refactor unnecessary else / elif when if block has a return s…
1b35d83
…tatement
@rtibbles
Update le-utils for zim file upload.
d395d86
@dependabot@rtibbles
Bump django from 3.2.3 to 3.2.4
d37768e
Bumps [django](https://github.com/django/django) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.3...3.2.4)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
@rtibbles
Merge pull requestlearningequality#3217from rtibbles/auto_format
83f549b
Push automated code fixes.
@rtibbles
Merge pull requestlearningequality#3218from learningequality/deepso…
ee234de
…urce-fix-08f4724d
Refactor unnecessary `else` / `elif` when `if` block has a `return` statement
@rtibbles
Merge pull requestlearningequality#3194from learningequality/depend…
5442a16
…abot/pip/django-3.2.4
Bump django from 3.2.3 to 3.2.4
@rtibbles
Merge pull requestlearningequality#3216from rtibbles/le_utils_upgrade
c7428e1
Update le-utils for zim file upload.
@bjester
Resolve merge conflicts
77357b1
@bjester
Recreate migration
614f7b1
@bjesterbjester
changed the title
Hotfixes release for last 2 sprints ending 2021-07 -06Hotfixes release for last 2 sprints ending 2021-07-06Jul 7, 2021
@bjester
bjester
marked this pull request as ready for review
July 7, 2021 17:43
@bjester
bjester
requested a review
from rtibblesJuly 7, 2021 17:43
@rtibbles
rtibbles
merged commit 5572799
into
learningequality:hotfixesJul 7, 2021
@bjesterbjester
mentioned this pull request
Jul 7, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles 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@micahscopes