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

Feature/#106 refactoring front end sliders #139

Merged
merged 10 commits into from
Dec 20, 2022
Merged

Feature/#106 refactoring front end sliders #139

merged 10 commits into from
Dec 20, 2022

Commits on Dec 12, 2022

  1. Extract slider logic into seperate file 

    Replace old sliders in Oscilloscope file with new Slider
    @motschel123
    motschel123 committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    23813e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Merge remote-tracking branch 'origin/feature/#106-refactoring-front-e… 

    …nd-sliders' into feature/#106-refactoring-front-end-sliders

# Conflicts:
#	Apps/frontend/src/views/Oscilloscope.svelte
    @jenswaechtler
    jenswaechtler committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    6f5be08 View commit details
    Browse the repository at this point in the history

  2. Moved controls in separate component 

    Signed-off-by: Jens Wächtler <jens.f.waechtler@fau.de>
    @jenswaechtler
    jenswaechtler committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    f2b5205 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. Resolved merge conflicts 

    Signed-off-by: Jens Wächtler <jens.f.waechtler@fau.de>
    @jenswaechtler
    jenswaechtler committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    cb4bbbe View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/#77-toggle-buttons' into… 

    … feature/#106-refactoring-front-end-sliders
    @jenswaechtler
    jenswaechtler committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    a40d0c2 View commit details
    Browse the repository at this point in the history

  3. Add indicatorElement to WaveControls 

    Signed-off-by: Jens Wächtler <jens.f.waechtler@fau.de>
    @jenswaechtler
    jenswaechtler committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    8d48d7c View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. Correct slider naming, add tests for testing generic slider implement… 

    …ation

Signed-off-by: Marcel Schöckel <marcel.schoeckel@gmail.com>
    @motschel123
    motschel123 committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    ced4ecf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feature/#106-refactoring-front-end-sliders

    @motschel123
    motschel123 authored Dec 19, 2022
    Configuration menu
    Copy the full SHA
    d33cdbc View commit details
    Browse the repository at this point in the history

  3. Fix for testing 

    Signed-off-by: Marcel Schöckel <marcel.schoeckel@gmail.com>
    @motschel123
    motschel123 committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    30148f2 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. Merge branch 'dev' into feature/#106-refactoring-front-end-sliders

    @motschel123
    motschel123 authored Dec 20, 2022
    Configuration menu
    Copy the full SHA
    ea77601 View commit details
    Browse the repository at this point in the history