Code

Feature/conflict resolve#367

Code

Merged

RutvikGhaskataEalf merged 95 commits intodevelopAElfProject/aelf-docs:developfrom feature/conflict-resolveAElfProject/aelf-docs:feature/conflict-resolveCopy head branch name to clipboardJan 9, 2025

-2

Commits

Commits on Jun 28, 2024

• Merge pull request #81 from AElfProject/develop

  Show description for e39c891
  yongenaelf

  authored
  e39c891

  Copy full SHA for e39c891

• Merge pull request #82 from AElfProject/develop

  Show description for b146740
  yongenaelf

  authored
  b146740

  Copy full SHA for b146740

• Merge pull request #83 from AElfProject/develop

  Show description for 9b2ee73
  yongenaelf

  authored
  9b2ee73

  Copy full SHA for 9b2ee73

• Merge pull request #84 from AElfProject/develop

  Show description for bed92e3
  yongenaelf

  authored
  bed92e3

  Copy full SHA for bed92e3

• Merge pull request #85 from AElfProject/develop

  Show description for d06ffa5
  yongenaelf

  authored
  d06ffa5

  Copy full SHA for d06ffa5

• Merge pull request #86 from AElfProject/develop

  Show description for cda33a2
  yongenaelf

  authored
  cda33a2

  Copy full SHA for cda33a2

• Merge pull request #88 from AElfProject/develop

  Show description for 7501182
  yongenaelf

  authored
  7501182

  Copy full SHA for 7501182

• Merge pull request #89 from AElfProject/develop

  Show description for 2fdaab8
  yongenaelf

  authored
  2fdaab8

  Copy full SHA for 2fdaab8

Commits on Jul 1, 2024

• Merge pull request #90 from AElfProject/develop

  Show description for 5f51a08
  yongenaelf

  authored
  5f51a08

  Copy full SHA for 5f51a08

• Merge pull request #91 from AElfProject/develop

  Show description for 4fa16f3
  yongenaelf

  authored
  4fa16f3

  Copy full SHA for 4fa16f3

Commits on Jul 8, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  a027581

  Copy full SHA for a027581

• Merge branch 'develop'

  yongenaelf

  committed
  208adec

  Copy full SHA for 208adec

Commits on Jul 19, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  065d3cb

  Copy full SHA for 065d3cb

Commits on Jul 24, 2024

• fix: internal links

  yongenaelf

  committed
  fa704df

  Copy full SHA for fa704df

• feat: move to quick start

  yongenaelf

  committed
  e81bb8a

  Copy full SHA for e81bb8a

• move to tools

  yongenaelf

  committed
  8c4adc3

  Copy full SHA for 8c4adc3

• update links

  yongenaelf

  committed
  86d493f

  Copy full SHA for 86d493f

• fix: broken links

  yongenaelf

  committed
  564c245

  Copy full SHA for 564c245

• add whitepaper pdf

  yongenaelf

  committed
  54720e0

  Copy full SHA for 54720e0

• Update Doc “resources/whitepaper-2/background-on-aelf/index”

  

  zenan-aelf

  authored and

  yongenaelf

  committed
  040f6b2

  Copy full SHA for 040f6b2

• fix: windows

  yongenaelf

  committed
  1d6a336

  Copy full SHA for 1d6a336

Commits on Jul 25, 2024

• Update Doc “resources/whitepaper-2/executive-summary/index”

  

  b-aelf

  authored and

  yongenaelf

  committed
  46a8511

  Copy full SHA for 46a8511

• Update Doc “resources/whitepaper-2/ai-integration-points-in-the-aelf-ecosystem/operational-excellence/index”

  

  b-aelf

  authored and

  yongenaelf

  committed
  22c723d

  Copy full SHA for 22c723d

• feat: update whitepaper pdf

  yongenaelf

  committed
  b9f43a7

  Copy full SHA for b9f43a7

• fix: anchor links

  yongenaelf

  committed
  07c42e0

  Copy full SHA for 07c42e0

Commits on Jul 26, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  4e4223b

  Copy full SHA for 4e4223b

• fix: merge conflict

  yongenaelf

  committed
  41daf22

  Copy full SHA for 41daf22

Commits on Jul 28, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  645fc56

  Copy full SHA for 645fc56

Commits on Jul 29, 2024

• feat: youtube video

  yongenaelf

  committed
  e9ed3c9

  Copy full SHA for e9ed3c9

• Merge branch 'develop'

  yongenaelf

  committed
  f22163c

  Copy full SHA for f22163c

Commits on Jul 30, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  b07ccb6

  Copy full SHA for b07ccb6

• Merge branch 'develop'

  yongenaelf

  committed
  b2634ed

  Copy full SHA for b2634ed

• Merge branch 'develop'

  yongenaelf

  committed
  1307d74

  Copy full SHA for 1307d74

• Merge branch 'develop'

  yongenaelf

  committed
  cf13f16

  Copy full SHA for cf13f16

• Merge branch 'develop'

  yongenaelf

  committed
  e50eb7c

  Copy full SHA for e50eb7c

Commits on Jul 31, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  ed45ec1

  Copy full SHA for ed45ec1

Commits on Aug 1, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  14be9d2

  Copy full SHA for 14be9d2

• Merge branch 'develop'

  yongenaelf

  committed
  878ecc6

  Copy full SHA for 878ecc6

• Merge branch 'develop'

  yongenaelf

  committed
  b26f589

  Copy full SHA for b26f589

Commits on Aug 3, 2024

• feat: lottery game video

  yongenaelf

  committed
  986d352

  Copy full SHA for 986d352

Commits on Aug 6, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  b89bd49

  Copy full SHA for b89bd49

• Merge branch 'develop'

  yongenaelf

  committed
  7d4eebd

  Copy full SHA for 7d4eebd

Commits on Aug 11, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  94ffce8

  Copy full SHA for 94ffce8

Commits on Aug 21, 2024

• fix: seo

  yongenaelf

  committed
  e341f50

  Copy full SHA for e341f50

Commits on Aug 25, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  b950450

  Copy full SHA for b950450

Commits on Aug 26, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  9c6b167

  Copy full SHA for 9c6b167

• Merge branch 'develop'

  yongenaelf

  committed
  710a731

  Copy full SHA for 710a731

Commits on Aug 28, 2024

• Merge branch 'develop'

  yongenaelf

  committed
  f3f7a9d

  Copy full SHA for f3f7a9d

• Merge branch 'develop'

  yongenaelf

  committed
  a2b17e9

  Copy full SHA for a2b17e9

• Merge branch 'develop'

  yongenaelf

  committed
  aa49e55

  Copy full SHA for aa49e55

Commits on Sep 1, 2024

• Feature: Merge todo dapp tutorial (#206)

  Show description for a6a735b
  

  5 peopleauthored
  a6a735b

  Copy full SHA for a6a735b

Commits on Sep 3, 2024

• feat: add hotjar

  yongenaelf

  committed
  058eed0

  Copy full SHA for 058eed0

• feat: update privacy policy

  yongenaelf

  committed
  074a627

  Copy full SHA for 074a627

• fix: formatting

  yongenaelf

  committed
  dc58195

  Copy full SHA for dc58195

• updated date

  yongenaelf

  committed
  9d6540f

  Copy full SHA for 9d6540f

Commits on Sep 4, 2024

• add s3 workflow

  yongenaelf

  committed
  f9c6a9a

  Copy full SHA for f9c6a9a

• add hotjar

  yongenaelf

  committed
  999961d

  Copy full SHA for 999961d

Commits on Sep 5, 2024

• docs: update aetherlink

  yongenaelf

  committed
  63a95f1

  Copy full SHA for 63a95f1

Commits on Sep 8, 2024

• run workflow on main only

  yongenaelf

  committed
  a2c51a3

  Copy full SHA for a2c51a3

• Merge branch 'develop'

  yongenaelf

  committed
  cbabaed

  Copy full SHA for cbabaed

Commits on Sep 9, 2024

• Update main.yml

  yongenaelf

  authored
  f6156e7

  Copy full SHA for f6156e7

Commits on Sep 10, 2024

• Merge commit '8bfdd13d8b6e327a3e07d396865ae1cd8dd6aa03'

  yongenaelf

  committed
  1a51b07

  Copy full SHA for 1a51b07

Commits on Sep 16, 2024

• update discord links

  yongenaelf

  committed
  beca216

  Copy full SHA for beca216

Commits on Sep 23, 2024

• Feature: Expense Tracker dApp Tutorial (#255)

  Show description for 023b03c
  

  4 peopleauthored
  023b03c

  Copy full SHA for 023b03c

Commits on Sep 30, 2024

• feat: ga amplitude

  

  AbigailDeng

  authored and

  AbigailDeng

  committed
  615ceee

  Copy full SHA for 615ceee

• feat: env

  

  AbigailDeng

  authored and

  AbigailDeng

  committed
  f50a439

  Copy full SHA for f50a439

• feat: change the order

  

  AbigailDeng

  authored and

  AbigailDeng

  committed
  41238db

  Copy full SHA for 41238db

• feat: amplitude

  

  AbigailDeng

  authored and

  AbigailDeng

  committed
  952d58e

  Copy full SHA for 952d58e

• Merge pull request #265 from AElfProject/feature/amplitude

  Show description for 2e25b64
  AbigailDeng

  authored
  2e25b64

  Copy full SHA for 2e25b64

Commits on Oct 7, 2024

• feat: Added Staking dApp tutorial and playground (#277)

  Show description for 188e294
  

  4 peopleauthored
  188e294

  Copy full SHA for 188e294

• feat: Added Staking dapp video

  vasmohi

  committed
  032117f

  Copy full SHA for 032117f

Commits on Oct 14, 2024

• chore: update dependencies

  yongenaelf

  committed
  6fad08f

  Copy full SHA for 6fad08f

• feat: session replay

  yongenaelf

  committed
  8cbabb9

  Copy full SHA for 8cbabb9

Commits on Oct 15, 2024

• fix: default tracking

  yongenaelf

  committed
  e80a8dd

  Copy full SHA for e80a8dd

• add plugin after init

  yongenaelf

  committed
  e4e08ac

  Copy full SHA for e4e08ac

• init after plugin is added

  yongenaelf

  committed
  97cc0a9

  Copy full SHA for 97cc0a9

• fix: gtag

  yongenaelf

  committed
  c685828

  Copy full SHA for c685828

• feat: gtm tag

  yongenaelf

  committed
  2143acc

  Copy full SHA for 2143acc

• refactor: npm for analytics

  yongenaelf

  committed
  ae64fbc

  Copy full SHA for ae64fbc

• fix: remove analytics from config

  yongenaelf

  committed
  e020e16

  Copy full SHA for e020e16

• fix: remove analytics from config

  yongenaelf

  committed
  9e6304d

  Copy full SHA for 9e6304d

• fix: run client side

  yongenaelf

  committed
  b820116

  Copy full SHA for b820116

• fix: defaulttracking

  yongenaelf

  committed
  1c8d087

  Copy full SHA for 1c8d087

• fix: depreciation

  yongenaelf

  committed
  55e133f

  Copy full SHA for 55e133f

• feat: session replay

  yongenaelf

  committed
  bc6b40a

  Copy full SHA for bc6b40a

Commits on Oct 17, 2024

• Merge remote-tracking branch 'origin/develop'

  yongenaelf

  committed
  ebc8484

  Copy full SHA for ebc8484

Commits on Oct 18, 2024

• feat: algolia docsearch (#294)

  yongenaelf

  authored
  9ba0c5b

  Copy full SHA for 9ba0c5b

Commits on Oct 19, 2024

• fix: update hotjar to load after amplitude

  yongenaelf

  committed
  19e0d76

  Copy full SHA for 19e0d76

• fix: hotjar id

  yongenaelf

  committed
  2fc0545

  Copy full SHA for 2fc0545

• fix: sample rate

  yongenaelf

  committed
  dcd54d2

  Copy full SHA for dcd54d2

Commits on Oct 23, 2024

• docs: update readme

  yongenaelf

  committed
  ee302b6

  Copy full SHA for ee302b6

Commits on Oct 25, 2024

• Merge remote-tracking branch 'origin/develop'

  yongenaelf

  committed
  353cd1d

  Copy full SHA for 353cd1d

Commits on Oct 30, 2024

• Feat: Updated side chain to dAppchain (#313)

  Show description for 0304b0c
  

  3 peopleauthored
  0304b0c

  Copy full SHA for 0304b0c

Commits on Jan 2, 2025

• feat: added complex types and types in restriction component of smart contract

  RutvikGhaskataEalf

  committed
  8088416

  Copy full SHA for 8088416

Commits on Jan 9, 2025

• fix: resolved conflicts

  RutvikGhaskataEalf

  committed
  5c6e9ec

  Copy full SHA for 5c6e9ec