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.

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

Jump to bottom

Resolve conflicts #126

Merged
merged 27 commits into from
Jun 26, 2023
Merged

Resolve conflicts #126

Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4f0b313
Merge pull request #101 from near-ndc/develop
Megha-Dev-19 Jun 2, 2023
68e8cdb
Merge pull request #107 from near-ndc/develop
Megha-Dev-19 Jun 5, 2023
c9c2a8a
fix wallet connector HERE/Meteor wallets
rubycop Jun 19, 2023
e627478
Merge pull request #121 from near-ndc/update-wallet-connector
rubycop Jun 21, 2023
f429e73
Enable Google analytics (#105)
rubycop Jun 5, 2023
f7aa549
Enable google analytics [testing on DEV] (#108)
rubycop Jun 6, 2023
231eeb2
GA React.js tracking issue (#109)
rubycop Jun 6, 2023
c295f5e
Bug Fix: Success SBT Page Redirect (#111)
Megha-Dev-19 Jun 7, 2023
0c1f548
Ft: Event Logs (#110)
Megha-Dev-19 Jun 7, 2023
996dd4c
Fix fractal pending link, Sub account checks added (#112)
Megha-Dev-19 Jun 9, 2023
7c250d3
Ft: Store existing users data (#113)
Megha-Dev-19 Jun 9, 2023
2476a96
Ft: Progress Bar (#114)
Megha-Dev-19 Jun 15, 2023
ba1e934
Bug Fix: Mint Redirect (#117)
Megha-Dev-19 Jun 19, 2023
74a7adb
OG SBT v1 (#116)
Megha-Dev-19 Jun 19, 2023
7f2b6ba
Detailed Event logs (#115)
Megha-Dev-19 Jun 19, 2023
988669f
Bug Fix: Confetti height and Width (#118)
Megha-Dev-19 Jun 20, 2023
fb753ff
OG SBT V2 (#119)
Megha-Dev-19 Jun 20, 2023
ecee63d
UI Improvements (#122)
Megha-Dev-19 Jun 25, 2023
1dbffa4
UI improvements (#123)
Megha-Dev-19 Jun 26, 2023
e742610
Comment OG SBT (#124)
Megha-Dev-19 Jun 26, 2023
cb3ae57
Merge branch 'develop' of https://github.com/near-ndc/i-am-human-dapp…
Megha-Dev-19 Jun 26, 2023
9e6b9df
Enable Google analytics (#105)
rubycop Jun 5, 2023
806c9e3
GA React.js tracking issue (#109)
rubycop Jun 6, 2023
8aa5262
OG SBT v1 (#116)
Megha-Dev-19 Jun 19, 2023
12a1e47
OG SBT V2 (#119)
Megha-Dev-19 Jun 20, 2023
532927a
UI Improvements (#122)
Megha-Dev-19 Jun 25, 2023
4f942ed
remove wrong code
Megha-Dev-19 Jun 26, 2023
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.