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

Antonio #65

Merged
merged 15 commits into from
Nov 11, 2022
Merged

Antonio #65

merged 15 commits into from
Nov 11, 2022

Commits on Oct 3, 2022

  1. write into run_conditios table of run_info database implementaion

    mu2eshift authored and agioiosa committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    04bfa5c View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. new commit after a pull

    agioiosa committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    da7738f View commit details
    Browse the repository at this point in the history

  2. fix merging

    mu2eshift authored and agioiosa committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    c91a71e View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. Merge branch 'develop' of https://github.com/art-daq/otsdaq into develop

    mu2eshift authored and agioiosa committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    3f1cb82 View commit details
    Browse the repository at this point in the history

  2. updates to implement run_conditions table writing on run_info db

    mu2eshift authored and agioiosa committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    518c1ef View commit details
    Browse the repository at this point in the history

  3. Merge conflict in otsdaq/TablePlugins/DesktopIconTableImpl.cc solved

    mu2eshift authored and agioiosa committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    aa46843 View commit details
    Browse the repository at this point in the history

  4. Merge conflict in otsdaq/TablePlugins/DesktopIconTableImpl.cc solved … 

    …with incoming changes meged
    mu2eshift authored and agioiosa committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    d177c78 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/art-daq/otsdaq into develop

    mu2eshift authored and agioiosa committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    33ece8e View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Merge branch 'develop' into antonio

    @antoniogioiosa
    antoniogioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    7bbc468 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'art-daq:develop' into develop

    @antoniogioiosa
    antoniogioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    7628653 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/art-daq/otsdaq into develop

    mu2eshift authored and agioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    be649d6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into antonio

    mu2eshift authored and agioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    4e81b60 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/antoniogioiosa/otsdaq in… 

    …to develop
    mu2eshift authored and agioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    34243a0 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'antonio' of https://github.com/antoniogioiosa/otsdaq in… 

    …to antonio
    mu2eshift authored and agioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    7021611 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into antonio

    mu2eshift authored and agioiosa committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    25da5f9 View commit details
    Browse the repository at this point in the history