Skip to content

/ cs-field-guide

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

Matrix simplifier improvements #1168

Merged
merged 18 commits into from Oct 17, 2019
Merged

Matrix simplifier improvements #1168

merged 18 commits into from Oct 17, 2019

Conversation

@courtneycb
Copy link
Contributor

courtneycb commented Oct 16, 2019

  • Adds ability for resulting equation in matrix-simplifier to be copied and pasted into all versions of the scene-editor interactive.

  • Adds ability to remove all equations in the matrix-simplifier interactive with one button click.

Resolves #1115
courtneycb added 9 commits Oct 15, 2019
@courtneycb
Add copy functionality to matrix-simplifier.
55b04ce
@courtneycb
WIP. Trying to get paste functionality working.
7337dc6
@courtneycb
Debugging.
1390b1f
@courtneycb
WIP.
Loading status checks…
d4c9475
@courtneycb
WIP.
Loading status checks…
0236f1f
@courtneycb
Copy-paste functionality seems to be working.
Loading status checks…
a8db775
@courtneycb
Add message.
689cc59
@courtneycb
Add ability to remove all equations from matrix simplifier.
Loading status checks…
21bfe75
@courtneycb
Fix copy-paste error.
Loading status checks…
4685631
@courtneycb courtneycb requested a review from eAlasdair Oct 16, 2019
@courtneycb courtneycb self-assigned this Oct 16, 2019
@courtneycb
Merge branch 'develop' into matrix-simplifier-improvements
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
6b04702
@eAlasdair
eAlasdair requested changes Oct 16, 2019
View changes
Copy link
Member

eAlasdair left a comment

Good work 👍 I think a few things can be done to polish it up a bit
csfieldguide/static/interactives/scene-editor/js/scene-editor.js Show resolved Hide resolved
csfieldguide/static/interactives/scene-editor/js/scene-editor.js Outdated Show resolved Hide resolved
csfieldguide/static/interactives/scene-editor/js/scene-editor.js Show resolved Hide resolved
csfieldguide/templates/interactives/matrix-simplifier.html Show resolved Hide resolved
csfieldguide/static/interactives/scene-editor/js/scene-editor.js Show resolved Hide resolved
csfieldguide/templates/interactives/matrix-simplifier.html Outdated Show resolved Hide resolved
csfieldguide/static/interactives/matrix-simplifier/js/matrix-simplifier.js Outdated Show resolved Hide resolved
@eAlasdair eAlasdair mentioned this pull request Oct 17, 2019
Merged
courtneycb added 5 commits Oct 17, 2019
@courtneycb
Review changes.
Loading status checks…
d01f4f4
@courtneycb
Merge branch 'develop' into matrix-simplifier-improvements
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
74d87b9
@courtneycb
Add pasting instructions.
9c45b98
@courtneycb
merge.
Loading status checks…
9b9b417
@courtneycb
Review changes.
Loading status checks…
0ee694e
@eAlasdair
eAlasdair reviewed Oct 17, 2019
View changes
Copy link
Member

eAlasdair left a comment

Couple of minor things, then it'll be ready
csfieldguide/static/interactives/matrix-simplifier/js/matrix-simplifier.js Show resolved Hide resolved
csfieldguide/templates/interactives/scene-editor.html Outdated Show resolved Hide resolved
courtneycb added 3 commits Oct 17, 2019
@courtneycb
review changes.
8c07283
@courtneycb
Layout changes.
Loading status checks…
f6cec35
@courtneycb
Hide paste hint in translation mode.
Loading status checks…
57640bb
@eAlasdair
eAlasdair approved these changes Oct 17, 2019
View changes
@courtneycb courtneycb merged commit 296e09b into develop Oct 17, 2019
5 checks passed
5 checks passed
codecov/patch Coverage not affected when comparing ace12a0...57640bb
Details
codecov/project 96.08% remains the same compared to ace12a0
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
pyup.io/safety-ci No dependencies with known security vulnerabilities.
Details
@courtneycb courtneycb deleted the matrix-simplifier-improvements branch Oct 17, 2019
@JackMorganNZ JackMorganNZ mentioned this pull request Dec 20, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eAlasdair eAlasdair

Assignees

@courtneycb courtneycb

Labels
interactives
Milestone
No milestone
2 participants
@courtneycb @eAlasdair
You can’t perform that action at this time.