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

Reinstate fix get all ancestors in a thread #43518

Merged
merged 18 commits into from
Aug 6, 2024
Merged

Reinstate fix get all ancestors in a thread #43518

merged 18 commits into from
Aug 6, 2024

Commits on Jun 11, 2024

  1. Add hideThreadReplies prop to ReportActionItem. Change ancestor.repor… 

    …t.parentReportID to ancestor.report.reportID.
    @kmbcook
    kmbcook committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    35d8dc1 View commit details
    Browse the repository at this point in the history

  2. Revert "Merge pull request Expensify#43201 from Expensify/revert-4255… 

    …4-fix/issue-41519-get-all-ancestors"

This reverts commit 01c418d, reversing
changes made to 4c86fbf.
    @kmbcook
    kmbcook committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    54c1b67 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. hideThreadReplies is optional

    @kmbcook
    kmbcook committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a401c7c View commit details
    Browse the repository at this point in the history

  2. Fix lint error

    @kmbcook
    kmbcook committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    af7b65b View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Resolve conflicts in ThreadDivider to finishing merging main

    @kmbcook
    kmbcook committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9c2148b View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Merge main and resolve conflicts

    @kmbcook
    kmbcook committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0b6188f View commit details
    Browse the repository at this point in the history

  2. Resolve another conflict due to merging main

    @kmbcook
    kmbcook committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    d846f68 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge main and fix confict

    @kmbcook
    kmbcook committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    381c32a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge main

    @kmbcook
    kmbcook committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a3a34f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge main

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

Commits on Jul 14, 2024

  1. Merge branch 'main' into fix/issue-41519-get-all-ancestors

    @kmbcook
    kmbcook committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    8c649f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Merge branch 'main' into fix/issue-41519-get-all-ancestors

    @kmbcook
    kmbcook committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    60f01c1 View commit details
    Browse the repository at this point in the history

  2. Show trip details view instead of report action item, when thread anc… 

    …estor report action is trip preview.
    @kmbcook
    kmbcook committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    8ec355f View commit details
    Browse the repository at this point in the history

  3. After npm run prettier

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

Commits on Jul 19, 2024

  1. Merge main

    @kmbcook
    kmbcook committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    2984e6d View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge branch 'main' into fix/issue-41519-get-all-ancestors

    @kmbcook
    kmbcook committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    3a5faf1 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge branch 'main' into fix/issue-41519-get-all-ancestors

    @kmbcook
    kmbcook committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    41624fa View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Resolve conflicts and merge main

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