Skip to content

Merge conflicts #369

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.

Sign up for GitHub

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

Merged
RutvikGhaskataEalf merged 95 commits into from
Jan 10, 2025
Merged

Merge conflicts #369

Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
e39c891
Merge pull request #81 from AElfProject/develop
yongenaelf Jun 28, 2024
b146740
Merge pull request #82 from AElfProject/develop
yongenaelf Jun 28, 2024
9b2ee73
Merge pull request #83 from AElfProject/develop
yongenaelf Jun 28, 2024
bed92e3
Merge pull request #84 from AElfProject/develop
yongenaelf Jun 28, 2024
d06ffa5
Merge pull request #85 from AElfProject/develop
yongenaelf Jun 28, 2024
cda33a2
Merge pull request #86 from AElfProject/develop
yongenaelf Jun 28, 2024
7501182
Merge pull request #88 from AElfProject/develop
yongenaelf Jun 28, 2024
2fdaab8
Merge pull request #89 from AElfProject/develop
yongenaelf Jun 28, 2024
5f51a08
Merge pull request #90 from AElfProject/develop
yongenaelf Jul 1, 2024
4fa16f3
Merge pull request #91 from AElfProject/develop
yongenaelf Jul 1, 2024
a027581
Merge branch 'develop'
yongenaelf Jul 8, 2024
208adec
Merge branch 'develop'
yongenaelf Jul 8, 2024
065d3cb
Merge branch 'develop'
yongenaelf Jul 19, 2024
fa704df
fix: internal links
yongenaelf Jul 23, 2024
e81bb8a
feat: move to quick start
yongenaelf Jul 23, 2024
8c4adc3
move to tools
yongenaelf Jul 23, 2024
86d493f
update links
yongenaelf Jul 23, 2024
564c245
fix: broken links
yongenaelf Jul 23, 2024
54720e0
add whitepaper pdf
yongenaelf Jul 23, 2024
040f6b2
Update Doc “resources/whitepaper-2/background-on-aelf/index”
zenan-aelf Jul 23, 2024
1d6a336
fix: windows
yongenaelf Jul 24, 2024
46a8511
Update Doc “resources/whitepaper-2/executive-summary/index”
b-aelf Jul 25, 2024
22c723d
Update Doc “resources/whitepaper-2/ai-integration-points-in-the-aelf-…
b-aelf Jul 25, 2024
b9f43a7
feat: update whitepaper pdf
yongenaelf Jul 25, 2024
07c42e0
fix: anchor links
yongenaelf Jul 25, 2024
4e4223b
Merge branch 'develop'
yongenaelf Jul 26, 2024
41daf22
fix: merge conflict
yongenaelf Jul 26, 2024
645fc56
Merge branch 'develop'
yongenaelf Jul 28, 2024
e9ed3c9
feat: youtube video
yongenaelf Jul 29, 2024
f22163c
Merge branch 'develop'
yongenaelf Jul 29, 2024
b07ccb6
Merge branch 'develop'
yongenaelf Jul 30, 2024
b2634ed
Merge branch 'develop'
yongenaelf Jul 30, 2024
1307d74
Merge branch 'develop'
yongenaelf Jul 30, 2024
cf13f16
Merge branch 'develop'
yongenaelf Jul 30, 2024
e50eb7c
Merge branch 'develop'
yongenaelf Jul 30, 2024
ed45ec1
Merge branch 'develop'
yongenaelf Jul 31, 2024
14be9d2
Merge branch 'develop'
yongenaelf Aug 1, 2024
878ecc6
Merge branch 'develop'
yongenaelf Aug 1, 2024
b26f589
Merge branch 'develop'
yongenaelf Aug 1, 2024
986d352
feat: lottery game video
yongenaelf Aug 3, 2024
b89bd49
Merge branch 'develop'
yongenaelf Aug 6, 2024
7d4eebd
Merge branch 'develop'
yongenaelf Aug 6, 2024
94ffce8
Merge branch 'develop'
yongenaelf Aug 11, 2024
e341f50
fix: seo
yongenaelf Aug 21, 2024
b950450
Merge branch 'develop'
yongenaelf Aug 25, 2024
9c6b167
Merge branch 'develop'
yongenaelf Aug 26, 2024
710a731
Merge branch 'develop'
yongenaelf Aug 26, 2024
f3f7a9d
Merge branch 'develop'
yongenaelf Aug 28, 2024
a2b17e9
Merge branch 'develop'
yongenaelf Aug 28, 2024
aa49e55
Merge branch 'develop'
yongenaelf Aug 28, 2024
a6a735b
Feature: Merge todo dapp tutorial (#206)
vasmohi Sep 1, 2024
058eed0
feat: add hotjar
yongenaelf Sep 3, 2024
074a627
feat: update privacy policy
yongenaelf Sep 3, 2024
dc58195
fix: formatting
yongenaelf Sep 3, 2024
9d6540f
updated date
yongenaelf Sep 3, 2024
f9c6a9a
add s3 workflow
yongenaelf Sep 4, 2024
999961d
add hotjar
yongenaelf Sep 4, 2024
63a95f1
docs: update aetherlink
yongenaelf Sep 2, 2024
a2c51a3
run workflow on main only
yongenaelf Sep 8, 2024
cbabaed
Merge branch 'develop'
yongenaelf Sep 8, 2024
f6156e7
Update main.yml
yongenaelf Sep 9, 2024
1a51b07
Merge commit '8bfdd13d8b6e327a3e07d396865ae1cd8dd6aa03'
yongenaelf Sep 10, 2024
beca216
update discord links
yongenaelf Sep 16, 2024
023b03c
Feature: Expense Tracker dApp Tutorial (#255)
vasmohi Sep 23, 2024
615ceee
feat: ga amplitude
Sep 30, 2024
f50a439
feat: env
Sep 30, 2024
41238db
feat: change the order
Sep 30, 2024
952d58e
feat: amplitude
Sep 30, 2024
2e25b64
Merge pull request #265 from AElfProject/feature/amplitude
AbigailDeng Sep 30, 2024
188e294
feat: Added Staking dApp tutorial and playground (#277)
vasmohi Oct 7, 2024
032117f
feat: Added Staking dapp video
vasmohi Oct 7, 2024
6fad08f
chore: update dependencies
yongenaelf Oct 14, 2024
8cbabb9
feat: session replay
yongenaelf Oct 14, 2024
e80a8dd
fix: default tracking
yongenaelf Oct 15, 2024
e4e08ac
add plugin after init
yongenaelf Oct 15, 2024
97cc0a9
init after plugin is added
yongenaelf Oct 15, 2024
c685828
fix: gtag
yongenaelf Oct 15, 2024
2143acc
feat: gtm tag
yongenaelf Oct 15, 2024
ae64fbc
refactor: npm for analytics
yongenaelf Oct 15, 2024
e020e16
fix: remove analytics from config
yongenaelf Oct 15, 2024
9e6304d
fix: remove analytics from config
yongenaelf Oct 15, 2024
b820116
fix: run client side
yongenaelf Oct 15, 2024
1c8d087
fix: defaulttracking
yongenaelf Oct 15, 2024
55e133f
fix: depreciation
yongenaelf Oct 15, 2024
bc6b40a
feat: session replay
yongenaelf Oct 15, 2024
ebc8484
Merge remote-tracking branch 'origin/develop'
yongenaelf Oct 17, 2024
9ba0c5b
feat: algolia docsearch (#294)
yongenaelf Oct 18, 2024
19e0d76
fix: update hotjar to load after amplitude
yongenaelf Oct 19, 2024
2fc0545
fix: hotjar id
yongenaelf Oct 19, 2024
dcd54d2
fix: sample rate
yongenaelf Oct 19, 2024
ee302b6
docs: update readme
yongenaelf Oct 23, 2024
353cd1d
Merge remote-tracking branch 'origin/develop'
yongenaelf Oct 25, 2024
0304b0c
Feat: Updated side chain to dAppchain (#313)
vasmohi Oct 30, 2024
8088416
feat: added complex types and types in restriction component of smart…
RutvikGhaskataEalf Jan 2, 2025
3bba5b9
fix: resolved conflicts
RutvikGhaskataEalf Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.