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.

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

The Big Merge #30

Merged
merged 129 commits into from
Mar 14, 2022
Merged

The Big Merge #30

merged 129 commits into from
Mar 14, 2022

Commits on Dec 19, 2020

  1. fix import

    kkrempl committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    8fc238e View commit details
    Browse the repository at this point in the history
  2. fix import

    kkrempl committed Dec 19, 2020
    Configuration menu
    Copy the full SHA
    ccfb5a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. pkl readers

    kkrempl committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    d45369d View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/reader_for_biologic_mpt' into de…

    …convolution
    
    Adding newest readers to deconvolution development
    kkrempl committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    7a1ccfe View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. EC_MS .pkl reader

    kkrempl committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    4a007a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2021

  1. Configuration menu
    Copy the full SHA
    0d2f2e5 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. Syntax correction of comments

    kkrempl committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    14a15d2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Configuration menu
    Copy the full SHA
    2142121 View commit details
    Browse the repository at this point in the history
  2. More TODOs

    kkrempl committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    2dd8a52 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2021

  1. Even more TODOs

    kkrempl committed Jan 28, 2021
    Configuration menu
    Copy the full SHA
    d6a4166 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2021

  1. small bug fixes

    kkrempl committed Jan 31, 2021
    Configuration menu
    Copy the full SHA
    e0e6e8a View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2021

  1. Configuration menu
    Copy the full SHA
    ac2e824 View commit details
    Browse the repository at this point in the history
  2. change docstring

    kkrempl committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    e4bc226 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e5d4580 View commit details
    Browse the repository at this point in the history
  4. delete merge conflicts

    kkrempl committed Feb 2, 2021
    Configuration menu
    Copy the full SHA
    17b4990 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2021

  1. Merge branch 'ec_features' into deconvolution_sbs

    Soren implentnting a few fixes of his work where it's available to the
    deconvolution work. This merge mainly brings over TODO's added in
    response to WS3 and first review of #6.
    ScottSoren committed Feb 7, 2021
    Configuration menu
    Copy the full SHA
    0e4c453 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    49a68a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    def6244 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    36e91c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Merge pull request #7 from ixdat/deconvolution_sbs

    Minor improvements after DWS3 and first #6 rev.
    kkrempl committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    85da96a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    27e044d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    057cca2 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Configuration menu
    Copy the full SHA
    663d709 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e5a7d86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    81a429f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a6cc29 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6f70787 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e2060e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Configuration menu
    Copy the full SHA
    8007662 View commit details
    Browse the repository at this point in the history
  2. integrate() and grab_of_t()

    Scott committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    7f1a718 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d462933 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3de1380 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. Configuration menu
    Copy the full SHA
    8fabdc7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c2448d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e2c87d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9096596 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. Configuration menu
    Copy the full SHA
    13707ff View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Configuration menu
    Copy the full SHA
    543c79b View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Configuration menu
    Copy the full SHA
    ca8813f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    52f0f7e View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. catching up documentation!

    ScottSoren committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    d04ea7f View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. improve documentation

    ScottSoren committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    438d1e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Write cinfdata text reader

    ScottSoren committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    aae8471 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6cf1caa View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. Configuration menu
    Copy the full SHA
    f86bd00 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0843560 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9690f8a View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. EC-MS exporting and saving

    ScottSoren committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    d0317b9 View commit details
    Browse the repository at this point in the history
  2. update docs, v0.0.10

    ScottSoren committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    b509ebd View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Configuration menu
    Copy the full SHA
    40f6544 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. Configuration menu
    Copy the full SHA
    365cc79 View commit details
    Browse the repository at this point in the history
  2. zilien tmp reader

    ScottSoren committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    1dda777 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2021

  1. Configuration menu
    Copy the full SHA
    08dfa0c View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2021

  1. Configuration menu
    Copy the full SHA
    7f27006 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2c66f6b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    931aace View commit details
    Browse the repository at this point in the history
  4. v0.1.0

    ScottSoren committed Apr 15, 2021
    Configuration menu
    Copy the full SHA
    2cc5f2c View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Configuration menu
    Copy the full SHA
    a535656 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b60071b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2021

  1. Configuration menu
    Copy the full SHA
    c1cc6dc View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. Configuration menu
    Copy the full SHA
    8f58925 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Configuration menu
    Copy the full SHA
    cc9e4da View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Configuration menu
    Copy the full SHA
    27ca576 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa947aa View commit details
    Browse the repository at this point in the history
  3. v0.1.4sec

    ScottSoren committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    bff55ed View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Configuration menu
    Copy the full SHA
    cef1735 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ccb3e8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    53ac8fc View commit details
    Browse the repository at this point in the history
  4. fix logo paths

    ScottSoren committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    7cc94a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2021

  1. SpectrumSeries

    ScottSoren committed Jul 10, 2021
    Configuration menu
    Copy the full SHA
    10d32b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2021

  1. Configuration menu
    Copy the full SHA
    6b74163 View commit details
    Browse the repository at this point in the history
  2. SEC potential decay

    ScottSoren committed Jul 11, 2021
    Configuration menu
    Copy the full SHA
    6475741 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Configuration menu
    Copy the full SHA
    344790e View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Configuration menu
    Copy the full SHA
    f75ef4e View commit details
    Browse the repository at this point in the history
  2. sec exporter

    ScottSoren committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    5b00cdd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    93beaad View commit details
    Browse the repository at this point in the history
  4. sec track wavelengths

    ScottSoren committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    6fd836a View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. finish docstrings for sec

    ScottSoren committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    0594f0f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'user_ready' into spectroelectrochemistry

    Need the documentation updates on user_ready to add
    spectroelectrochemistry to
    ScottSoren committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    f930f6e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f03ed57 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2021

  1. Configuration menu
    Copy the full SHA
    6fc3bbb View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Configuration menu
    Copy the full SHA
    e4c1c9d View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Merge pull request #13 from ixdat/spectroelectrochemistry

    Spectroelectrochemistry
    Søren Bertelsen Scott committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    f920015 View commit details
    Browse the repository at this point in the history
  2. clean up documentation

    ScottSoren committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    9e1112f View commit details
    Browse the repository at this point in the history
  3. fix rtd error

    ScottSoren committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    ded9e3d View commit details
    Browse the repository at this point in the history
  4. ------ ixdat v0.1.5 --------

    ScottSoren authored and ScottSoren committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    a4631fd View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2021

  1. Configuration menu
    Copy the full SHA
    a4454ea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6df351 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5889fab View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. Configuration menu
    Copy the full SHA
    86367de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2580890 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    79e70fa View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2021

  1. Configuration menu
    Copy the full SHA
    9433d5c View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. Merge pull request #21 from ixdat/Fuzhou

    Additions for smoother EC-MS functionality
    Søren Bertelsen Scott committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    ef61fa4 View commit details
    Browse the repository at this point in the history
  2. merge (no fixing yet)

    ScottSoren committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    6034663 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c387249 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    802b864 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Configuration menu
    Copy the full SHA
    af5be33 View commit details
    Browse the repository at this point in the history
  2. debug for ivium reader

    ScottSoren committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    ac8cf0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b34c31c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fb63487 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    39c97a5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aa86808 View commit details
    Browse the repository at this point in the history
  7. debug msrh_sec_decay

    ScottSoren committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    4e7c97c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    021bd86 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2021

  1. Configuration menu
    Copy the full SHA
    75a2d91 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    62dadab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b65ddb4 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. new biologic timestamp form (#33)

    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    6fe912c View commit details
    Browse the repository at this point in the history
  2. tspan_bg not t_bg (#27)

    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    f89e66a View commit details
    Browse the repository at this point in the history
  3. Voltammogram not Voltammagram (#23)

    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    7baf0b8 View commit details
    Browse the repository at this point in the history
  4. Zilien as EC-MS, EC, or MS (#32)

    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    78d9dd9 View commit details
    Browse the repository at this point in the history
  5. ---- ixdat v0.1.7 ------

    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    2db8d8f View commit details
    Browse the repository at this point in the history
  6. Merge branch 'user_ready' into backend_fixes

    This incorporates fixes to several recent issues,
    fixed for ixdat v0.1.7, just released from [user_ready]
    ScottSoren committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    57221f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2022

  1. Configuration menu
    Copy the full SHA
    9889bed View commit details
    Browse the repository at this point in the history
  2. merge ixdat v0.1.8

    ScottSoren committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    80c875b View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2022

  1. Configuration menu
    Copy the full SHA
    de1c4fa View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. fix CyclicVoltammogram

    ScottSoren committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    c21e809 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. Configuration menu
    Copy the full SHA
    de4dada View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    299f706 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b2a0d86 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0087cd0 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Configuration menu
    Copy the full SHA
    4700a7d View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Configuration menu
    Copy the full SHA
    0276f21 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9e9e39b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f806455 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    77040ba View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    76bd43b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. finish review: ECMS axes order and misc details

    ScottSoren committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    d051c8f View commit details
    Browse the repository at this point in the history