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.

Sign up for GitHub

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

Jump to bottom

Release v0.14.x -> Develop #7057

Merged
merged 155 commits into from Jun 17, 2020
Merged

Release v0.14.x -> Develop #7057

merged 155 commits into from Jun 17, 2020

Conversation

indirectlylit
Copy link
Contributor

Summary

…

Reviewer guidance

…

References

…

Contributor Checklist

PR process:

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Testing:

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

jonboiser and others added 30 commits May 20, 2020 14:39
@jonboiser
Update SelectAddressForm
9658d7a
@jonboiser
On AvailableChannelsPage, select all channels if ?setup=true
998ef20
@jonboiser
Add FacilityUser is_admin filter
2d018f9
@jonboiser
Add really basic /facilityadmins endpoint
00cdf0d
@jonboiser
Integrate SelectSuperAdminAccountForm with /facilityadmins
0c3afc5
@jonboiser
Stub GrantSuperUserPermissionsView and StartFacilityImportView
5243a4e
@jonboiser
Integrate SelectSuperAdminAccountForm with backend
bbca21b
@jonboiser
Add check for admin role
0f12d39
@jonboiser
Add startOverAction to commonCoreStrings
d3dce16
@jonboiser
Add tests for device setup APIs
a692c40
@rtibbles
Fix typo in sandbox attribute name.
459e8ba
@rtibbles
Fix errors when scorm data is undefined.
f76c073
@nucleogenesis
Add border shadow, move controls to top of content
cf54b3e
@jonboiser
Fix problems with Sync Modals on Data Page
9973162
@jonboiser
Fix missing birthyear
b56f267
@jonboiser
Update requirements/dev.txt
ba98d78
@jonboiser
Stub peer facilities client-server endpoint
9a22962
@jonboiser
Merge remote-tracking branch 'origin/develop' into peer-sync-ui-integ…
d30acab 
…ration

# Conflicts:
#	kolibri/core/assets/src/views/sync/FacilityNameAndSyncStatus.vue
@indirectlylit
Merge pull request #7001 from rtibbles/SCORM_hashi_bugs
6a96f92 
Scorm hashi bugs
@indirectlylit
Merge remote-tracking branch 'le/app-support' into top-panel-for-docu…
affff9c 
…ments
@cpauya
Add device-name, max-channels arguments. Prepends the device name to …
5980867 
…the facilities created. Prepend the facility name to the classes created. Prepend the device name to the users created.
@cpauya
Use a function which catches exceptions or encoding errors when loggi…
7d01994 
…ng info during a run.
@rtibbles
Remove API based bootstrapping.
ffb8f77 
Set default conditional on app plugin being enabled.
@rtibbles
Prevent login to stop people circumventing remote access restrictions.
88e7dd0
@rtibbles
Update allowRemoteAccess frontend flag to be a no-op when app plugin …
f02ac0f 
…is disabled.
@rtibbles
Only prevent remote access login when running with app plugin enabled.
7845f1a
@jonboiser
Remove manageSync vuex module
5f0af18
@radinamatic
Update the remaining strings after the string chill review
88dc078
@rtibbles
Merge pull request #7015 from rtibbles/remote_access
c7117d9 
Bootstrap remote access data into page
@radinamatic
Last change
5631b86
indirectlylit and others added 19 commits June 12, 2020 18:30
@indirectlylit
latest strings
4308345
@indirectlylit
Merge pull request #7056 from indirectlylit/strings
93a8bc7 
latest strings
@indirectlylit
Merge pull request #7052 from indirectlylit/merge-pf
2b93b68 
Merge pf
@indirectlylit
merge
b0fcfb9
@indirectlylit
rename in-context strings
4d06abd
Beginning tagline work
250840a
Removed pdb and added black formatting
a6d6606
ordering python imports
94f26eb
black formatting
4c0f058
Fixing end-of-file-fixer
33280c3
Explanation text appears only if the allow other browsers to connect …
77e8bd6 
…option is checked
Applying styling copied from KRadioButton description
d4cad84
@radinamatic
Learner and guest scenarios reviewed
f23fa5e
fixed end of files
f237f15
@radinamatic
Add comment to use incognito browser
1a91000
@radinamatic
Linter pass
9f39261
@rtibbles
Merge pull request #7058 from jredrejo/taglines_backend
d1b2010 
Beginning tagline work
@indirectlylit
Merge pull request #7031 from radinamatic/app-context-gherkins-0.14
2d77537 
Add Gherkin scenarios for Android app context
@indirectlylit
Merge pull request #7062 from radinamatic/gherkins-review-0.14
ff8aa88 
Learner and guest Gherkin scenarios reviewed
@codecov
Copy link

codecov bot commented Jun 16, 2020 •
edited

Codecov Report

Merging #7057 into develop will decrease coverage by 0.32%.
The diff coverage is 48.28%.

Impacted Files Coverage Δ
...libri/core/assets/src/api-resources/contentNode.js 0.00% <0.00%> (ø)
...ibri/core/assets/src/api-resources/facilityTask.js 0.00% <0.00%> (ø)
kolibri/core/assets/src/api-resources/index.js 100.00% <ø> (ø)
kolibri/core/assets/src/api-resources/task.js 4.34% <ø> (+0.18%) ⬆️
...libri/core/assets/src/mixins/commonSyncElements.js 8.33% <0.00%> (-16.67%) ⬇️
...ibri/core/assets/src/state/modules/core/actions.js 22.91% <0.00%> (+0.13%) ⬆️
...ri/core/assets/src/state/modules/core/mutations.js 41.17% <ø> (+2.28%) ⬆️
...ssets/src/views/sync/ConfirmationRegisterModal.vue 18.18% <0.00%> (-2.88%) ⬇️
...ssets/src/views/sync/FacilityNameAndSyncStatus.vue 25.00% <ø> (-13.47%) ⬇️
...sync/SelectAddressModalGroup/SelectAddressForm.vue 6.97% <0.00%> (+0.08%) ⬆️
... and 82 more

jonboiser and others added 9 commits June 16, 2020 15:38
@indirectlylit indirectlylit merged commit 9a059c8 into develop Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet