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

Develop #508

Merged
merged 24 commits into from
Jul 18, 2024
Merged

Develop #508

merged 24 commits into from
Jul 18, 2024

Commits on May 21, 2024

  1. --- 

    updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 21, 2024
    Configuration menu
    Copy the full SHA
    e4fc4ad View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. updated attackcon location

    @adpare
    adpare committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b20f98f View commit details
    Browse the repository at this point in the history

  2. redirections

    @adpare
    adpare committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0f212e8 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Fix whitespace

    @jondricek
    jondricek committed May 30, 2024
    Configuration menu
    Copy the full SHA
    9fb41a8 View commit details
    Browse the repository at this point in the history

  2. More whitespace fixing

    @jondricek
    jondricek committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8676ae4 View commit details
    Browse the repository at this point in the history

  3. Update Matrix titles and breadcrumbs

    @jondricek
    jondricek committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ba339ad View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Merge branch 'master' into develop

    @adpare
    adpare committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    16ea4a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. updated trainings

    @adpare
    adpare committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2a79712 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. typo

    @clemiller
    clemiller committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    916f49b View commit details
    Browse the repository at this point in the history

  2. move modules to lessons

    @clemiller
    clemiller committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    9de55c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge pull request #502 from mitre-attack/dependabot/pip/requests-2.32.0 

    Bump requests from 2.31.0 to 2.32.0
    @jondricek
    jondricek authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    2308ddb View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge pull request #506 from mitre-attack/master 

    Update develop branch
    @adpare
    adpare authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    51c21bb View commit details
    Browse the repository at this point in the history

  2. add attackcon to header

    @adpare
    adpare committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1e99da6 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Merge remote-tracking branch 'origin/develop' into updates_trainings

    @clemiller
    clemiller committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    144d2f9 View commit details
    Browse the repository at this point in the history

  2. added attackcon 5

    @adpare
    adpare committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f5bd5a8 View commit details
    Browse the repository at this point in the history

  3. Update titles

    @jondricek
    jondricek committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    698fa96 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #507 from mitre-attack/updates_trainings 

    Add trainings to website
    @jondricek
    jondricek authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a113641 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. rename trainings

    @adpare
    adpare committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c706a72 View commit details
    Browse the repository at this point in the history

  2. training landing page content

    @adpare
    adpare committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    23cf439 View commit details
    Browse the repository at this point in the history

  3. trainings landing page update

    @adpare
    adpare committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    9bbacc3 View commit details
    Browse the repository at this point in the history

  4. Refactor trainings section

    @jondricek
    jondricek committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    409f350 View commit details
    Browse the repository at this point in the history

  5. Minor wording tweaks

    @jondricek
    jondricek committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    8bbc30d View commit details
    Browse the repository at this point in the history

  6. Update python version

    @jondricek
    jondricek committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f4dc4b4 View commit details
    Browse the repository at this point in the history

  7. Update website to 4.1.5

    @jondricek
    jondricek committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b03bb55 View commit details
    Browse the repository at this point in the history