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

[Chore] Merge stage history into dev #2995

Merged

finnar-bin merged 40 commits into dev from chore/fix-dev-stage-conflicts

Oct 3, 2024

Contributor

finnar-bin commented Oct 3, 2024 •

edited

Loading

[Chore] Merge stage history into dev

github-actions bot and others added 30 commits

July 22, 2024 12:43


          Stage Release (#2865)

7962cd7

Created by Github action

Co-authored-by: Andres Galindo <agalin920@gmail.com>


          Stage Release (#2871)

1db37e0

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Resolve merge conflicts (#2878)

bc3337e

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage merge conflicts (#2880)

55fdb6b

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage merge conflicts 2 (#2893)

27b2b83

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2885)

71e4c82

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2895)

fa8c77b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2894)

ccb121c

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts 3 (#2903)

954b4a0

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2900)

d1f6f29

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Fix/resolve stage conflicts (#2907)

a0841f3

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2906)

58f0bcb

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2912)

17151b5

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2910)

4541c18

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve dev stage conflicts (#2931)

0ec8716

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2924)

04baa91

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2944)

84b5ce4

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2935)

dcdb274

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve stage conflicts (#2949)

7876c43

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2946)

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2955)

754e42d

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2950)

c44b38f

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve stage conflicts (#2964)

2ef5b94

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2957)

deeb2f5

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/fix merge issues (#2968)

f151682

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/fix merge issues (#2969)

b48e55b

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2971)

4a95625

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2967)

33208b5


          Chore/resolve beta conflicts (#2976)

c5d02f9

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2973)

c66a379

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

finnar-bin and others added 8 commits

September 27, 2024 10:12


          Chore/resolve stage conflicts (#2980)

894ec12

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2979)

c9f80df

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2987)

258cade

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2983)

e4ba2c9

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2992)

edf0d54

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2993)

fd149e3

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Resolve stage conflicts (#2994)

f57c8af

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          resolve merge conflicts

6e8e701

finnar-bin added the ready label

finnar-bin requested a review from agalin920

October 3, 2024 00:24

finnar-bin added 2 commits

October 3, 2024 08:26


          remove input props

b75b7e9


          remove input props

64012c2

finnar-bin enabled auto-merge (squash)

October 3, 2024 00:35

finnar-bin changed the title ~~[Chore] Resolve dev/stage conflicts~~ [Chore] Merge stage history into dev

finnar-bin added the maintenance label

agalin920 approved these changes

View reviewed changes

finnar-bin merged commit dcf4278 into dev

1 check passed

finnar-bin deleted the chore/fix-dev-stage-conflicts branch

October 3, 2024 03:10

finnar-bin restored the chore/fix-dev-stage-conflicts branch

October 3, 2024 03:22

finnar-bin deleted the chore/fix-dev-stage-conflicts branch

October 3, 2024 03:22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maintenance ready