Merge remote-tracking branch 'origin/Development-of-Analysis-GUI' into Development-of-Analysis-GUI
- Conflicts:
- Plotting/EventPlots.py
deen | Jun 14 2019, 15:53 |
deen | Jun 14 2019, 15:53 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
992748feefcd | Microtubulus <michael.graf> | latest | Jun 14 2019 | |||
c60e9dea179e | Microtubulus <michael.graf> | Merge branch 'master' into Development-of-Analysis-GUI | Jun 14 2019 | |||
f905f230b58c | Microtubulus <michael.graf> | Merge branch 'Development-of-Analysis-GUI' of https://c4science. | Jun 14 2019 | |||
8574c2881649 | Microtubulus <michael.graf> | Event detector is now running on the selected files. All the files have a… | Jun 13 2019 | |||
62e380e32bf3 | deen | Moved sorting | Jun 12 2019 | |||
6b675b7de877 | deen | Minor cosmetic changes | Jun 12 2019 | |||
e7f6ab17a17f | deen | Modified MakeIndividualIVs | Jun 12 2019 | |||
3b8380e96bc8 | deen | Minor changes for plotting Bokeh in Jupyter | Jun 12 2019 | |||
e377aa3ddf2c | deen | sort Voltages | Jun 12 2019 | |||
aeb2d8e44532 | deen | changed variable name | Jun 12 2019 | |||
34c4670c4cf8 | deen | Merge remote-tracking branch 'origin/master' | Jun 12 2019 | |||
90792c965edb | deen | disabled nonfitted events by default | Jun 12 2019 |