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

Run page ui improvements #840

Merged
merged 19 commits into from
Sep 28, 2020

Commits on Aug 21, 2020

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

Commits on Aug 24, 2020

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

Commits on Aug 25, 2020

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

Commits on Aug 31, 2020

  1. More work on Run monkey page

    VakarisZ committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    d8a0a6d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0471229 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. Configuration menu
    Copy the full SHA
    c4f4a8e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    38b1cfa View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/run_page_ui_improvements' into r…

    …un_page_ui_improvements
    
    # Conflicts:
    #	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/CommandDisplay.js
    #	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/LocalManualRunOptions.js
    #	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage/ManualRunOptions.js
    #	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/BackButton.js
    #	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/InlineSelection.js
    #	monkey/monkey_island/cc/ui/src/components/ui-components/inline-selection/NextSelectionButton.js
    #	monkey/monkey_island/cc/ui/src/styles/Main.scss
    #	monkey/monkey_island/cc/ui/src/styles/components/inline-selection/InlineSelection.scss
    VakarisZ committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    ac9c04e View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'upstream/develop' into run_page_ui_impr…

    …ovements
    
    # Conflicts:
    #	monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
    #	monkey/monkey_island/cc/ui/src/styles/Main.scss
    VakarisZ committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    6eab147 View commit details
    Browse the repository at this point in the history
  5. Removed unused function

    VakarisZ committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    5331095 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3c410d6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4d87514 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    dcf1b49 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    62708cf View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Configuration menu
    Copy the full SHA
    6e10dd2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c5e4493 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    12e7c40 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1559504 View commit details
    Browse the repository at this point in the history