Skip to content

Commit

Permalink
Merge conflicts (#369)
Browse files Browse the repository at this point in the history
* fix: internal links

* feat: move to quick start

* move to tools

* update links

* fix: broken links

* add whitepaper pdf

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

* fix: windows

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

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

* feat: update whitepaper pdf

* fix: anchor links

* fix: merge conflict

* feat: youtube video

* feat: lottery game video

* fix: seo

* Feature: Merge todo dapp tutorial (#206)

* Feat/update git commands (#188)

* Adding new git commands for DAO

* minor change

* Added github instruction in nft contract page

---------

Co-authored-by: RutvikGhaskataEalf <[email protected]>

* Quick start Todo dApp Tutorial (#203)

* feat: Added NFT tutorial Initial Draft

* Adding new file before merging to dev

* Removing extra file

* Updating the contract address for deploy and build

* Adding command to interact

* Adding commands for NFT

* Adding new steps

* Prepared some doucment content for NFT (Frontend)

* Pushing new commands for NFT

* moving the commands to last

* Added create-nft all steps

* Refector create nft functions

* Completed all nft functions

* Adding the desciption of the functions

* Updated Docs for nft page

* Adding more desciption for fetch and transfer

* Completed nft tutorial page

* Update content on nft page

* Update function logic

* Updated nft page content

* fix: updated document with fixes

* fix: updated document for next steps

* fix: updated document for further steps

* fix: doc update for validate NFT section

* feat:Added document for todo-app

* Adding smart contract code

* Worked on Todo dApp Frontend Documentation

* Updated Text

* Updated Github Commands

* feat: Adding Reviewed Documentation

---------

Co-authored-by: AelfHarsh <[email protected]>
Co-authored-by: RutvikAelf <[email protected]>
Co-authored-by: Harsh <[email protected]>

* Added nft-fe-directory.png

* fix: shifted nft-fe-directory.png directory

* feat: file listing

* fix: updated  todo dApp

* fix: updated todo dApp main page title

* fix: Removed duplicate nft tutorial folder

* fix: Updated ToDo dApp title for consistency

* fix: Updated todo app URL

* feat: Added youtube video inside todo dapp tutorial

* fix: Updated youtube video link for todo dapp tutorial

* fix: Updated youtube embed link for todo dapp tutorial

* fix: Updated width of youtube embed link

---------

Co-authored-by: AelfHarsh <[email protected]>
Co-authored-by: RutvikGhaskataEalf <[email protected]>
Co-authored-by: Harsh <[email protected]>
Co-authored-by: yongen.loong <[email protected]>

* feat: add hotjar

* feat: update privacy policy

* fix: formatting

* updated date

* add s3 workflow

* add hotjar

* docs: update aetherlink

* run workflow on main only

* Update main.yml

* update discord links

* Feature: Expense Tracker dApp Tutorial (#255)

* Expense Tracker Tutorial (#223)

* Prepared Expense Tracker Doc page

* Updated Images according new Frontend UI

* feat: Added step 1-3 documentation for expense tracker dapp

* fix: documentation fixes

---------

Co-authored-by: mohit6b <[email protected]>

* docs: update aetherlink docs

* docs: update oracle

* docs: remove ccip

* fix: Updated content for expense tracker

* fix: Removed old video link

* update discord links

* feat: Embedded Expense Tracker Video

---------

Co-authored-by: RutvikGhaskataEalf <[email protected]>
Co-authored-by: mohit6b <[email protected]>
Co-authored-by: yongen.loong <[email protected]>

* feat: ga amplitude

* feat: env

* feat: change the order

* feat: amplitude

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

* Expense Tracker Tutorial (#223)

* Prepared Expense Tracker Doc page

* Updated Images according new Frontend UI

* feat: Added step 1-3 documentation for expense tracker dapp

* fix: documentation fixes

---------

Co-authored-by: mohit6b <[email protected]>

* docs: update aetherlink docs

* docs: update oracle

* docs: remove ccip

* fix: Updated content for expense tracker

* fix: Removed old video link

* update discord links

* feat: Embedded Expense Tracker Video

* Feature: Staking dapp tutorial (#262)

* feat: Added Single Pool Staking documentation

* Added Frontend Documentation for Staking dApp

* Updated content of Frontend Documentation for Staking dApp

* Updated the Step no in Staking frontend dapp

* fix: Reviewed and updated the staking dApp tutorial

* Updated Images of Staking dApp

---------

Co-authored-by: RutvikGhaskataEalf <[email protected]>

* fix: Updated _setup.md with latest dotnet version for tutorials

* fix: Updated stking tutorial with token reference

* feat: Added aelf-playground with new features (#271)

* Feat: Added tutorials, deployments and command line options to aelf playground (#273)

* feat: Added aelf-playground with new features

* feat: Added tutorials, deployment and command line options

---------

Co-authored-by: RutvikGhaskataEalf <[email protected]>
Co-authored-by: mohit6b <[email protected]>
Co-authored-by: yongen.loong <[email protected]>

* feat: Added Staking dapp video

* chore: update dependencies

* feat: session replay

* fix: default tracking

* add plugin after init

* init after plugin is added

* fix: gtag

* feat: gtm tag

* refactor: npm for analytics

* fix: remove analytics from config

* fix: remove analytics from config

* fix: run client side

* fix: defaulttracking

* fix: depreciation

* feat: session replay

* feat: algolia docsearch (#294)

* fix: update hotjar to load after amplitude

* fix: hotjar id

* fix: sample rate

* docs: update readme

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

* feat: added allowance-dapp tutorial documentation (#305)

* feat: Added documentation for allowance dapp (step 1-5)

* feat/allowance-dapp

* fix: Reviewed and fixed allowance dApp tutorial

---------

Co-authored-by: vasmohi <[email protected]>

* feat: removed command-line instruction for faucet and keep only web-faucet functionality instruction (#306)

* Added Exception handled in remaining functions of NFT tutorial (#246)

* Added Exception handled in remaining functions of NFT tutorial

* Removed extra changes

* feat: Removed mentions of zk-Rollups (#308)

* Updated sequence

* Fix: Updated roadmap image (#309)

* feat: Removed mentions of zk-Rollups

* fix: Updated roadmap image

* fix: Updated aelf whitepaper v2.0 pdf (#310)

* Feature: Updated dAppchain name (#312)

* feat: Renamed sidechain to dAppchain

* feat: Renamed mainchain AELF to aelf mainchain

* fix: aelf mainchain

---------

Co-authored-by: RutvikGhaskataEalf <[email protected]>
Co-authored-by: yongenaelf <[email protected]>

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

---------

Co-authored-by: yongenaelf <[email protected]>
Co-authored-by: yongen.loong <[email protected]>
Co-authored-by: zenan-aelf <[email protected]>
Co-authored-by: b-aelf <[email protected]>
Co-authored-by: vasmohi <[email protected]>
Co-authored-by: AelfHarsh <[email protected]>
Co-authored-by: Harsh <[email protected]>
Co-authored-by: mohit6b <[email protected]>
Co-authored-by: AbigailDeng <[email protected]>
Co-authored-by: AbigailDeng <[email protected]>
  • Loading branch information
11 people authored Jan 10, 2025
1 parent e73c061 commit a036c6c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a036c6c

Please sign in to comment.