Code

Merge features exclude content#490

Code

Draft

daodesigner wants to merge 100 commits intodevelopclrfund/monorepo:developfrom cohort/EthStakerclrfund/monorepo:cohort/EthStakerCopy head branch name to clipboard

+3,712-2,873

Commits

Commits on Dec 14, 2021

• Add KYC explanations

  samajammin

  committed
  d3a863f

  Copy full SHA for d3a863f

Commits on Dec 16, 2021

• Update ProjectAdded copy

  samajammin

  committed
  4f64355

  Copy full SHA for 4f64355

• Update Twitter account for info

  samajammin

  committed
  4d345a2

  Copy full SHA for 4d345a2

• Update recipient guide copy

  samajammin

  committed
  eb84090

  Copy full SHA for eb84090

• Merge pull request #415 from ethereum/develop

  Show description for 6b99c62
  daodesigner

  authored
  6b99c62

  Copy full SHA for 6b99c62

• Add netlify config

  samajammin

  committed
  42c2a73

  Copy full SHA for 42c2a73

• Add null checks on registryInfo

  samajammin

  committed
  7911074

  Copy full SHA for 7911074

Commits on Dec 22, 2021

• Add required documents

  samajammin

  committed
  3ef7fbe

  Copy full SHA for 3ef7fbe

Commits on Jan 3, 2022

• Add specification of address within last 3 months

  samajammin

  committed
  b56ff09

  Copy full SHA for b56ff09

Commits on Jan 8, 2022

• Add staking-specific copy

  samajammin

  committed
  a98c1d3

  Copy full SHA for a98c1d3

• Add more staking mentions

  samajammin

  committed
  151b78f

  Copy full SHA for 151b78f

• Add "Ethereum" copy

  samajammin

  committed
  bc96411

  Copy full SHA for bc96411

• Add changes from Danny's feedback

  samajammin

  committed
  7b200ec

  Copy full SHA for 7b200ec

Commits on Jan 10, 2022

• Merge pull request #490 from ethereum/staking-copy

  Show description for ff5fdbd
  samajammin

  authored
  ff5fdbd

  Copy full SHA for ff5fdbd

• Merge pull request #480 from ethereum/kyc-info

  Show description for 294769e
  samajammin

  authored
  294769e

  Copy full SHA for 294769e

• Merge pull request #425 from clrfund/develop

  Show description for 43cda19
  daodesigner

  authored
  43cda19

  Copy full SHA for 43cda19

• Merge pull request #426 from ethereum/staking-round

  Show description for 1c40a47
  daodesigner

  authored
  1c40a47

  Copy full SHA for 1c40a47

• Merge branch 'develop' into staking-round

  samajammin

  authored
  2c966b8

  Copy full SHA for 2c966b8

• Update L2 ETH references

  samajammin

  committed
  f2d3c59

  Copy full SHA for f2d3c59

• Add notifications of recipient cap

  samajammin

  committed
  3b9d247

  Copy full SHA for 3b9d247

• Merge pull request #500 from ethereum/recipient-cap

  Show description for 9ca031a
  samajammin

  authored
  9ca031a

  Copy full SHA for 9ca031a

• Clean up how it works copy

  samajammin

  committed
  60011a5

  Copy full SHA for 60011a5

Commits on Jan 11, 2022

• Merge pull request #498 from ethereum/l2-eth

  Show description for ffa25d9
  samajammin

  authored
  ffa25d9

  Copy full SHA for ffa25d9

• Simplify round criteria

  samajammin

  committed
  26bd028

  Copy full SHA for 26bd028

• Merge pull request #501 from ethereum/staking-criteria-updates

  Show description for d014aa0
  samajammin

  authored
  d014aa0

  Copy full SHA for d014aa0

• remove breadcrumbs from join form

  corwintines

  committed
  9614af6

  Copy full SHA for 9614af6

• Merge pull request #502 from ethereum/hide-breadcrumbs

  Show description for a4a230d
  samajammin

  authored
  a4a230d

  Copy full SHA for a4a230d

Commits on Jan 12, 2022

• Re-sort criteria

  samajammin

  committed
  25e96cd

  Copy full SHA for 25e96cd

Commits on Jan 17, 2022

• make executeRequest only owner (#503)

  pettinarip

  authored
  6e45ee3

  Copy full SHA for 6e45ee3

Commits on Jan 19, 2022

• Refactor: maxRecipients getter (#505)

  Show description for d0cb664
  

  pettinarip

  and

  samajammin

  authored
  d0cb664

  Copy full SHA for d0cb664

Commits on Jan 24, 2022

• Fix about pages (#504)

  Show description for c3690f4
  pettinarip

  authored
  c3690f4

  Copy full SHA for c3690f4

• fix transaction modal which now expects a promise of a tx (#507)

  pettinarip

  authored
  31f09d9

  Copy full SHA for 31f09d9

• Refactor: maxRecipients getter (#505) (#506)

  Show description for 1911485
  

  pettinarip

  and

  samajammin

  authored
  1911485

  Copy full SHA for 1911485

• Merge branch 'develop' into staking-round

  pettinarip

  committed
  1ca9a8e

  Copy full SHA for 1ca9a8e

Commits on Jan 25, 2022

• update netlify toml with new factory instance

  pettinarip

  committed
  25db19f

  Copy full SHA for 25db19f

Commits on Jan 27, 2022

• Update scripts to support prod circuits with 16 batch size (#508)

  Show description for 08adfa1
  daodesigner

  authored
  08adfa1

  Copy full SHA for 08adfa1

Commits on Jan 28, 2022

• Merge branch 'develop' into staking-round

  pettinarip

  committed
  8e74169

  Copy full SHA for 8e74169

Commits on Feb 11, 2022

• select working sheet by name

  pettinarip

  committed
  b48c943

  Copy full SHA for b48c943

• Merge pull request #510 from ethereum/google-sheet-by-title

  Show description for 9b2e10f
  samajammin

  authored
  9b2e10f

  Copy full SHA for 9b2e10f

• Merge branch 'develop' into staking-round

  pettinarip

  committed
  23cd955

  Copy full SHA for 23cd955

Commits on Mar 1, 2022

• Update branding to ES

  auryn-macmillan

  committed
  abf3f57

  Copy full SHA for abf3f57

• Fix some awkward sentences

  auryn-macmillan

  committed
  a20931a

  Copy full SHA for a20931a

• Merge branch 'cohort/EthStaker' into staking-round

  pettinarip

  authored
  b2dcd6f

  Copy full SHA for b2dcd6f

• update scripts to use custom verifiers (#514)

  Show description for 63013c1
  

  daodesigner

  and

  pettinarip

  authored
  63013c1

  Copy full SHA for 63013c1

• Merge pull request #433 from ethereum/staking-round

  Show description for 6377d99
  daodesigner

  authored
  6377d99

  Copy full SHA for 6377d99

Commits on Mar 3, 2022

• Update meta image to absolute URL

  samajammin

  committed
  d91760b

  Copy full SHA for d91760b

• Add og & twitter metadata

  samajammin

  committed
  98eac01

  Copy full SHA for 98eac01

• Merge pull request #470 from clrfund/meta-image-fix

  Show description for 56036c4
  auryn-macmillan

  authored
  56036c4

  Copy full SHA for 56036c4

Commits on Mar 8, 2022

• Add VUE_APP_FIRST_ROUND to ignore old rounds

  samajammin

  committed
  76d688a

  Copy full SHA for 76d688a

• sort getRounds query by starttime

  pettinarip

  committed
  1269881

  Copy full SHA for 1269881

• Remove /rounds route

  samajammin

  committed
  5133241

  Copy full SHA for 5133241

Commits on Mar 9, 2022

• Default VUE_APP_FIRST_ROUND to 0

  Show description for f4fb0eb
  

  samajammin

  and

  pettinarip

  authored
  f4fb0eb

  Copy full SHA for f4fb0eb

• Merge pull request #474 from ethereum/first-round-env-var

  Show description for b87fe73
  auryn-macmillan

  authored
  b87fe73

  Copy full SHA for b87fe73

Commits on Mar 10, 2022

• Update criteria to match announcement copy

  samajammin

  committed
  5296f33

  Copy full SHA for 5296f33

• Merge pull request #479 from clrfund/criteria-update

  Show description for 1504e76
  auryn-macmillan

  authored
  1504e76

  Copy full SHA for 1504e76

Commits on Apr 19, 2022

• Add announcement link to round info

  samajammin

  committed
  8054ad5

  Copy full SHA for 8054ad5

• Merge pull request #485 from clrfund/ethstaker-dates

  Show description for a25f8f3
  auryn-macmillan

  authored
  a25f8f3

  Copy full SHA for a25f8f3

Commits on Apr 24, 2022

• fetch user registry address from the factory when there is no current round

  pettinarip

  committed
  d1412b5

  Copy full SHA for d1412b5

• Merge pull request #486 from ethereum/user-registry-factory

  Show description for 31dd277
  samajammin

  authored
  31dd277

  Copy full SHA for 31dd277

Commits on May 5, 2022

• Add optional ENV variable to customize matching pool

  samajammin

  committed
  4b967ae

  Copy full SHA for 4b967ae

• Update frontend to query ENV variable

  samajammin

  committed
  37da086

  Copy full SHA for 37da086

Commits on May 8, 2022

• Remove matching pool overwrite query

  samajammin

  committed
  5bfe357

  Copy full SHA for 5bfe357

• Remove unused import

  samajammin

  committed
  ca223d2

  Copy full SHA for ca223d2

• Fix broken link

  samajammin

  committed
  019d7e3

  Copy full SHA for 019d7e3

Commits on May 9, 2022

• Merge pull request #487 from clrfund/custom-matching-pool

  Show description for ec10ab2
  auryn-macmillan

  authored
  ec10ab2

  Copy full SHA for ec10ab2

• Merge pull request #489 from clrfund/fix-brightid-link

  Show description for 089bd7a
  auryn-macmillan

  authored
  089bd7a

  Copy full SHA for 089bd7a

Commits on May 10, 2022

• fix condition to check if the round has started

  pettinarip

  committed
  b011f35

  Copy full SHA for b011f35

• adjust markdown imgs and pre code to be able to shrink the screen

  pettinarip

  committed
  c380dfa

  Copy full SHA for c380dfa

Commits on May 11, 2022

• Merge pull request #491 from ethereum/fix-join-message

  Show description for f18d920
  samajammin

  authored
  f18d920

  Copy full SHA for f18d920

• Merge pull request #492 from ethereum/fix-markdown-content

  Show description for 505ccc6
  samajammin

  authored
  505ccc6

  Copy full SHA for 505ccc6

Commits on May 14, 2022

• check existing balance before formatting it

  pettinarip

  committed
  b68e9e9

  Copy full SHA for b68e9e9

• Merge pull request #494 from ethereum/fix-bignumber-format

  daodesigner

  authored
  f4ab844

  Copy full SHA for f4ab844

• change max cart size to 8

  pettinarip

  committed
  e9d990a

  Copy full SHA for e9d990a

• Merge pull request #495 from ethereum/max-cart-size

  Show description for 7c498b2
  auryn-macmillan

  authored
  7c498b2

  Copy full SHA for 7c498b2

Commits on May 16, 2022

• only render brightid link if available

  yuetloo

  committed
  c31778c

  Copy full SHA for c31778c

• Merge pull request #496 from clrfund/fix/brightid-link-not-found

  daodesigner

  authored
  cd3c2d2

  Copy full SHA for cd3c2d2

Commits on May 20, 2022

• fetch round contributions balance from the contract

  pettinarip

  committed
  6431bb8

  Copy full SHA for 6431bb8

• Merge pull request #497 from ethereum/fix-contributions-balances

  Show description for d44ba36
  auryn-macmillan

  authored
  d44ba36

  Copy full SHA for d44ba36

Commits on May 23, 2022

• refactor and fix race conditions while loading round & user data

  pettinarip

  committed
  349b3b0

  Copy full SHA for 349b3b0

Commits on May 27, 2022

• Merge pull request #499 from ethereum/refactor-loading-data

  Show description for 0915a92
  auryn-macmillan

  authored
  0915a92

  Copy full SHA for 0915a92

Commits on Jun 1, 2022

• detect invalid date when challenge period is too large

  yuetloo

  committed
  60e61cb

  Copy full SHA for 60e61cb

Commits on Jun 16, 2022

• Merge pull request #505 from clrfund/fix/join-deadline

  Show description for c981515
  auryn-macmillan

  authored
  c981515

  Copy full SHA for c981515

Commits on Jul 4, 2022

• merged with the develop branch

  yuetloo

  committed
  371a264

  Copy full SHA for 371a264

• remove obsolete code

  yuetloo

  committed
  482cb07

  Copy full SHA for 482cb07

• fix test failure by reverting ethStaker changes

  yuetloo

  committed
  63c72a9

  Copy full SHA for 63c72a9

• remove ethStaker content

  yuetloo

  committed
  e10b68f

  Copy full SHA for e10b68f

• remove unused file

  yuetloo

  committed
  50bbfaa

  Copy full SHA for 50bbfaa

Commits on Jul 6, 2022

• removed ethStaker specific deploymnet script

  yuetloo

  committed
  e81f81f

  Copy full SHA for e81f81f

• revert changes to remove round list

  yuetloo

  committed
  96da1a3

  Copy full SHA for 96da1a3

Commits on Jul 7, 2022

• add PermissionedRecipientRegistry

  yuetloo

  committed
  7970a7c

  Copy full SHA for 7970a7c

• fix error from empty round address if round is loaded from VUE_APP_EXTRA_ROUND

  yuetloo

  committed
  a2b1f3f

  Copy full SHA for a2b1f3f

• Revert "fix error from empty round address if round is loaded from VUE_APP_EXTRA_ROUND"

  Show description for a1a670a
  yuetloo

  committed
  a1a670a

  Copy full SHA for a1a670a

• Revert "add PermissionedRecipientRegistry"

  Show description for 6b514e1
  yuetloo

  committed
  6b514e1

  Copy full SHA for 6b514e1

• Revert "revert changes to remove round list"

  Show description for 30485dd
  yuetloo

  committed
  30485dd

  Copy full SHA for 30485dd

• Revert "removed ethStaker specific deploymnet script"

  Show description for a6f4348
  yuetloo

  committed
  a6f4348

  Copy full SHA for a6f4348

• Revert "remove unused file"

  Show description for 39b0967
  yuetloo

  committed
  39b0967

  Copy full SHA for 39b0967

• Revert "remove ethStaker content"

  Show description for 6399118
  yuetloo

  committed
  6399118

  Copy full SHA for 6399118

• Revert "fix test failure by reverting ethStaker changes"

  Show description for d949482
  yuetloo

  committed
  d949482

  Copy full SHA for d949482

• Revert "remove obsolete code"

  Show description for da41f0e
  yuetloo

  committed
  da41f0e

  Copy full SHA for da41f0e

• Revert "merged with the develop branch"

  Show description for ee60330
  yuetloo

  committed
  ee60330

  Copy full SHA for ee60330