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

Merge master to dev #1240

Closed
wants to merge 97 commits into from
Closed

Merge master to dev #1240

wants to merge 97 commits into from

Commits on Apr 5, 2023

  1. Upgrade jfrog-cli-core to 2.31.1 (#739)

    * Improve UI for scan command (#706)
    
    * Upgrade go version in go.mod to 1.20 (#732)
    
    * Fix lint issues found (#733)
    
    * Config transfer - ensure target not older than source (#721)
    
    * Update tests environment - nuget and dotnet to version 6  (#734)
    
    * Flatten audit graph (#736)
    
    * Use gradle-dep-tree with Audit (#719)
    
    ---------
    
    Co-authored-by: Sara Omari <114062096+sarao1310@users.noreply.github.com>
    Co-authored-by: Eyal Ben Moshe <eyalbenmoshe@jfrog.com>
    Co-authored-by: Michael Sverdlov <sverdlov93@gmail.com>
    Co-authored-by: Yahav Itzhak <yahavi@users.noreply.github.com>
    5 people authored Apr 5, 2023
    Configuration menu
    Copy the full SHA
    4d20901 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

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

Commits on Apr 19, 2023

  1. Merge remote-tracking branch 'upstream/dev' into mastercore

    # Conflicts:
    #	.github/workflows/analysis.yml
    #	go.mod
    #	go.sum
    #	xray/audit/java/gradle.go
    #	xray/commands/audit/generic/auditmanager.go
    sverdlov93 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    1381a8b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f8e3a22 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

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

Commits on May 3, 2023

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

Commits on May 16, 2023

  1. Merge branch 'dev'

    eyalbe4 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    2ddeac0 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Configuration menu
    Copy the full SHA
    11ce1e8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev'

    talarian1 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    521d832 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f470da2 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

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

Commits on May 23, 2023

  1. Configuration menu
    Copy the full SHA
    ae0b91d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5a53932 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c07d9fb View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

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

Commits on May 26, 2023

  1. Merge branch 'dev'

    eyalbe4 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    e91d430 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2023

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

Commits on May 31, 2023

  1. Configuration menu
    Copy the full SHA
    b4ddac8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev'

    eyalbe4 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    6dca5e7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9fa7b09 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Merge branch 'dev'

    yahavi committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    a46fb01 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    94469f4 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    b330d82 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'master' into dev

    omerzi committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    7141b4c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev'

    eyalbe4 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    ec17933 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Merge branch 'dev'

    RobiNino committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    83ced5a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Merge branch 'dev'

    yahavi committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    9e57a49 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'master' into dev

    omerzi committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    fe4c82a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    47a0f3f View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

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

Commits on Jul 18, 2023

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

Commits on Jul 19, 2023

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

Commits on Jul 23, 2023

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

Commits on Jul 31, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    f79600c View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    db385fe View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

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

Commits on Aug 23, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    85f562e View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

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

Commits on Aug 25, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    ab61366 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Merge branch 'dev'

    attiasas committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b41d4f0 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev'

    attiasas committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    a02bfdf View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    4bc9682 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Configuration menu
    Copy the full SHA
    0a13b66 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bab627c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3042a43 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Configuration menu
    Copy the full SHA
    6b129f1 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'dev'

    EyalDelarea committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    6acb9a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Merge branch 'dev'

    RobiNino committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    be4499c View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Configuration menu
    Copy the full SHA
    202e914 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b39fdf4 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

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

Commits on Oct 4, 2023

  1. Merge branch 'dev'

    yahavi committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    fc0ae72 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Merge branch 'dev'

    EyalDelarea committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    bf7f0ce View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Configuration menu
    Copy the full SHA
    f513574 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    597ddcd View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

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

Commits on Oct 18, 2023

  1. Configuration menu
    Copy the full SHA
    f5d0ad0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    45beee8 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

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

Commits on Nov 8, 2023

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

Commits on Nov 9, 2023

  1. Promote version to 2.46.1

    omerzi committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    dca01d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Promote version to 2.46.2

    omerzi committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    82fecb0 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

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

Commits on Dec 3, 2023

  1. Configuration menu
    Copy the full SHA
    8a8a5de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dfb6e8c View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

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

Commits on Dec 15, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    4c57380 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    931eb29 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

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

Commits on Dec 21, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    c825598 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. Merge branch 'dev'

    eyalbe4 committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    4f4127c View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

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

Commits on Jan 7, 2024

  1. Promote version to v2.47.10

    omerzi committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    39b06f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge branch 'dev'

    eyalbe4 committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    8129e67 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

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

Commits on Feb 20, 2024

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

Commits on Feb 21, 2024

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

Commits on Mar 18, 2024

  1. Configuration menu
    Copy the full SHA
    c333812 View commit details
    Browse the repository at this point in the history
  2. Promoted version to 2.49.0

    RobiNino committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    def18c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge remote-tracking branch 'upstream/dev'

    # Conflicts:
    #	go.mod
    #	go.sum
    sverdlov93 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    a063de8 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

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

Commits on May 9, 2024

  1. Configuration menu
    Copy the full SHA
    9f2f331 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    102e9bb View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge branch 'dev'

    EyalDelarea committed May 22, 2024
    Configuration menu
    Copy the full SHA
    bf51565 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0e5f28c View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'dev'

    eyalbe4 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    a291658 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge branch 'dev'

    RobiNino committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    5396c66 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

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

Commits on Jul 23, 2024

  1. Merge branch 'dev'

    eyalbe4 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    de2c4bf View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Merge branch 'dev'

    RobiNino committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    ee2d82d View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Merge branch 'dev'

    RobiNino committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    5ce9dde View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'dev'

    RobiNino committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    f6e9b75 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch 'dev'

    eyalbe4 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    7c6d44b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2f1cbb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge branch 'dev'

    eyalbe4 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    99fd0f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Rename env var (#1239)

    eyalbe4 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    dbdb1c4 View commit details
    Browse the repository at this point in the history