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

Iris: Add about-iris link in first message #6917

Merged
merged 19 commits into from
Jul 18, 2023
Merged

Iris: Add about-iris link in first message #6917

merged 19 commits into from
Jul 18, 2023

Commits on Jul 15, 2023

  1. add about-iris link

    @RY997
    RY997 committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    ac4cc78 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    5ec9de8 View commit details
    Browse the repository at this point in the history

  2. adjust first message after permission save in DB

    @RY997
    RY997 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    e4f9cc4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    061391e View commit details
    Browse the repository at this point in the history

  4. Update exercise-chat-widget.component.ts

    @RY997
    RY997 authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    98564d5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @bassner
    bassner authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    a505ea3 View commit details
    Browse the repository at this point in the history

  6. add async

    @RY997
    RY997 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    704076e View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/feature/aboutiris-in-firstmsg' i… 

    …nto feature/aboutiris-in-firstmsg
    @RY997
    RY997 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    f15e51c View commit details
    Browse the repository at this point in the history

  8. remove chores

    @RY997
    RY997 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    39eff0c View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. fix response issue

    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    3de90cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    f70a3ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    e7c21fa View commit details
    Browse the repository at this point in the history

  4. Update exercise-chat-widget.component.ts

    @RY997
    RY997 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    e885538 View commit details
    Browse the repository at this point in the history

  5. fix async issue

    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    b128d49 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/feature/aboutiris-in-firstmsg' i… 

    …nto feature/aboutiris-in-firstmsg

# Conflicts:
#	src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.ts
    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    62fffeb View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/feature/aboutiris-in-firstmsg' i… 

    …nto feature/aboutiris-in-firstmsg
    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    5c0e1ee View commit details
    Browse the repository at this point in the history

  8. should show first message for new exercise after user accept policy

    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    7fbd84a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    86b8f04 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/accept-iris-ui' into feature/aboutiris-in-firstmsg

    @RY997
    RY997 authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    8d7228c View commit details
    Browse the repository at this point in the history