Skip to content

Actions: ExodusMovement/exodus-oss

Actions

Rebase Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
347 workflow runs
347 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

chore: release @exodus/keychain@7.6.0 (#179) Rebase Conflicts #347: Commit 294194f pushed by exodus-github-hydra-bot
November 16, 2024 12:59 57s master
master
November 16, 2024 12:59 57s
chore: release @exodus/keychain@7.6.0 Rebase Conflicts #346: Pull request #179 synchronize by fboucquez
November 16, 2024 12:56 13s ci/release/2bb9500e-9140-41f0-8be6-d353858fffcd
ci/release/2bb9500e-9140-41f0-8be6-d353858fffcd
November 16, 2024 12:56 13s
fix: schnorrSign return type and type and signature (#176) Rebase Conflicts #345: Commit 7e8d8bb pushed by fboucquez
November 16, 2024 08:50 1m 1s master
master
November 16, 2024 08:50 1m 1s
fix: schnorrSign return type and type and signature Rebase Conflicts #344: Pull request #176 synchronize by fboucquez
November 15, 2024 19:11 12s fboucquez/fix/keychain-signSchnorr-type
fboucquez/fix/keychain-signSchnorr-type
November 15, 2024 19:11 12s
feat: expose sodium encrypt/decrypt box in keychain api (#174) Rebase Conflicts #343: Commit 618bc35 pushed by andrewtoth
November 15, 2024 19:06 1m 0s master
master
November 15, 2024 19:06 1m 0s
fix: schnorrSign return type and type and signature Rebase Conflicts #342: Pull request #176 synchronize by fboucquez
November 15, 2024 14:46 13s fboucquez/fix/keychain-signSchnorr-type
fboucquez/fix/keychain-signSchnorr-type
November 15, 2024 14:46 13s
fix: schnorrSign return type and type and signature Rebase Conflicts #341: Pull request #176 synchronize by fboucquez
November 15, 2024 12:06 17s fboucquez/fix/keychain-signSchnorr-type
fboucquez/fix/keychain-signSchnorr-type
November 15, 2024 12:06 17s
fix: schnorrSign return type and type and signature Rebase Conflicts #340: Pull request #176 synchronize by fboucquez
November 15, 2024 12:05 14s fboucquez/fix/keychain-signSchnorr-type
fboucquez/fix/keychain-signSchnorr-type
November 15, 2024 12:05 14s
chore: release @exodus/keychain@7.5.1 (#172) Rebase Conflicts #339: Commit 96c59c5 pushed by exodus-github-hydra-bot
November 13, 2024 17:52 59s master
master
November 13, 2024 17:52 59s
chore: release @exodus/keychain@7.5.1 Rebase Conflicts #338: Pull request #172 synchronize by fboucquez
November 13, 2024 17:49 15s ci/release/154453ef-9784-4fc0-bc40-d1409b75818d
ci/release/154453ef-9784-4fc0-bc40-d1409b75818d
November 13, 2024 17:49 15s
fix: add signSchnorr to keychain api (#171) Rebase Conflicts #337: Commit 2da2b05 pushed by fboucquez
November 13, 2024 17:09 1m 0s master
master
November 13, 2024 17:09 1m 0s
chore: set publicConfig.access to public (#169) Rebase Conflicts #336: Commit 0c104c9 pushed by sparten11740
November 6, 2024 07:50 58s master
master
November 6, 2024 07:50 58s
chore: set publicConfig.access to public Rebase Conflicts #335: Pull request #169 synchronize by sparten11740
November 5, 2024 18:49 15s sparten11740/chore/set-publish-access-to-public
sparten11740/chore/set-publish-access-to-public
November 5, 2024 18:49 15s
chore: release @exodus/keychain@7.5.0 (#167) Rebase Conflicts #334: Commit f6db90b pushed by exodus-github-hydra-bot
November 3, 2024 14:41 55s master
master
November 3, 2024 14:41 55s
chore: release @exodus/keychain@7.5.0 Rebase Conflicts #333: Pull request #167 synchronize by sparten11740
November 3, 2024 14:38 10s ci/release/45d5f5bd-3732-4aca-9dea-6c7e7eb74bc6
ci/release/45d5f5bd-3732-4aca-9dea-6c7e7eb74bc6
November 3, 2024 14:38 10s
fix: bump slip10 to remove dependance on elliptic fork (#166) Rebase Conflicts #332: Commit 29ca457 pushed by sparten11740
November 3, 2024 14:36 1m 0s master
master
November 3, 2024 14:36 1m 0s
feat: use exodus/crypto instead of sodium where possible (#164) Rebase Conflicts #331: Commit fbaf8ae pushed by ChALkeR
October 28, 2024 12:02 57s master
master
October 28, 2024 12:02 57s
feat: use exodus/crypto instead of sodium where possible Rebase Conflicts #330: Pull request #164 synchronize by ChALkeR
October 27, 2024 00:12 16s chalker/25519/0
chalker/25519/0
October 27, 2024 00:12 16s
chore: release @exodus/keychain@7.4.0 (#163) Rebase Conflicts #329: Commit 55df4ff pushed by exodus-github-hydra-bot
October 17, 2024 16:03 1m 3s master
master
October 17, 2024 16:03 1m 3s
chore: release @exodus/keychain@7.4.0 Rebase Conflicts #328: Pull request #163 synchronize by sparten11740
October 17, 2024 15:42 14s ci/release/be0ea69a-9574-4509-a244-7e1ed03d869d
ci/release/be0ea69a-9574-4509-a244-7e1ed03d869d
October 17, 2024 15:42 14s
feat: expose sodium.sign (#161) Rebase Conflicts #327: Commit 457d201 pushed by sparten11740
October 17, 2024 15:38 59s master
master
October 17, 2024 15:38 59s
feat: add sodium.getKeysFromSeed (#160) Rebase Conflicts #326: Commit 96496f2 pushed by sparten11740
October 17, 2024 15:37 30s master
master
October 17, 2024 15:37 30s
feat: expose sodium.sign Rebase Conflicts #325: Pull request #161 synchronize by sparten11740
October 17, 2024 15:12 13s sparten11740/feat/expose-sodium-sign
sparten11740/feat/expose-sodium-sign
October 17, 2024 15:12 13s
docs: add a planned removal comment (#159) Rebase Conflicts #324: Commit ae0b1d0 pushed by mvayngrib
October 14, 2024 19:14 1m 1s master
master
October 14, 2024 19:14 1m 1s
chore: release @exodus/key-identifier@1.3.0,@exodus/keychain@7.3.0 (#… Rebase Conflicts #323: Commit 7f9a446 pushed by exodus-github-hydra-bot
October 3, 2024 17:16 58s master
master
October 3, 2024 17:16 58s