-
Notifications
You must be signed in to change notification settings - Fork 13
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
Merge erwanp fork #5
Open
githeap
wants to merge
126
commits into
aluque:master
Choose a base branch
from
erwanp:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Not extensively tested but still backward compatible
(actually not sure i made anything easier, except maybe from the dependency being installed automatically)
…or for reaction graph
…by default. Fixes #18
fix zoom problems with field-overlay on. Reset Show Field on to True …
add a plot_condition() function
Merge and delete develop branch
fix parsing of atomic composition in excited species A(*)
Correct time axis
Update qtplaskin.modeldata to be more pythonic3 and fix minor visual bug
Fix bug when trying to get density
Fix deprecation of .basedir
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(former discussion: see #3 )
Hello @aluque !
I have resolved merge conflicts.
@erwanp , does it look good to you?
Please, merge whenever you feel ready.