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 upstream from polkadot-js/apps@master (2b40308) #100

Merged
merged 200 commits into from
Feb 15, 2024

Conversation

aleph-ci-user
Copy link

Merge upstream

Upstream details

Target details

  • Repository: Cardinal-Cryptography/azero-dev
  • Branch: alephzero
  • Recent common ancestor with upstream: 65fc709

BuddyGlas and others added 30 commits November 10, 2023 18:06
* Re-add Asia and Geo balancer endpoints for Unique

* Update packages/apps-config/src/endpoints/testing.ts

Co-authored-by: Jaco <jacogr@gmail.com>

---------

Co-authored-by: Jaco <jacogr@gmail.com>
* Rename KILT Protocol to "BOTLabs Trusted Entity"

The full node is provided by "B.T.E. BOTLabs Trusted Entity GmbH" and not
"KILT Protocol".

* fix order of keys

* remove unused import
* Add Subspace Gemini-3g Nova testing rpc

This RPC is live

* remove training comma
* innovatorchain in evm chains

* add Innovator Chain to the list
jacogr and others added 21 commits January 25, 2024 09:53
* Disable unreachable endpoints

* Fix lint
* Add Paseo Testnet

* include locale

* Update packages/apps-config/src/api/constants.ts

Co-authored-by: Jaco <jacogr@gmail.com>

* lint

* Update packages/apps-config/src/endpoints/index.ts

Co-authored-by: Jaco <jacogr@gmail.com>

---------

Co-authored-by: Jaco <jacogr@gmail.com>
…s#10215)

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>
@youPickItUp
Copy link

To see "real" change this command might be helpful

git diff alephzero a0-ops-upstream-automerge -I "Copyright 2017-" --diff-filter=ad -- . ':!***package.json' ':!yarn.lock' ':!CONTRIBUTORS' ':!CHANGELOG.md'

Shows diff between alephzero and a0-ops-upstream-automerge and ignores

  • lines containing "Copyright 2017-"
  • removed files
  • added files
  • all package.json
  • a few listed files as we

@Marcin-Radecki Marcin-Radecki added this pull request to the merge queue Feb 15, 2024
Merged via the queue into alephzero with commit e285afd Feb 15, 2024
5 checks passed
@aleph-ci-user aleph-ci-user deleted the a0-ops-upstream-automerge branch February 21, 2024 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.