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

Merge develop into master #203

Merged
merged 53 commits into from
Feb 29, 2024
Merged

Merge develop into master #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4140765
feat: the home view was finished, there is two components pending:
krlz16 Jan 16, 2024
0e674e8
feat: Blocks Tokens Addresses Transactions views were redesigned
krlz16 Jan 24, 2024
3b9b9d0
fix: typos were fixed
krlz16 Jan 24, 2024
b353840
Merge pull request #185 from rsksmart/feat/home-view
nicov-iov Jan 24, 2024
202f678
feat: detail views have been modified
krlz16 Jan 25, 2024
a9644c6
Merge branch 'explorer-v2' into feat/blocks-view
krlz16 Jan 25, 2024
155b327
Merge branch 'explorer-v2' into feat/redesign-detail-views
krlz16 Jan 25, 2024
49d5c9e
Merge pull request #186 from rsksmart/feat/blocks-view
nicov-iov Jan 30, 2024
eeba5b7
feat: Added styles to details views such as Block Transaction and add…
krlz16 Jan 30, 2024
daed8da
fix: VUE_APP_WS_URL was modified to initial value
krlz16 Jan 30, 2024
29d4a81
Merge branch 'explorer-v2' into feat/redesign-detail-views
krlz16 Jan 30, 2024
74d8fac
Merge pull request #187 from rsksmart/feat/redesign-detail-views
nicov-iov Jan 31, 2024
8ff8d74
feat: the design was adapted to be responsive
krlz16 Feb 7, 2024
be9801c
feat: Integrated apps view
krlz16 Feb 8, 2024
f88d2f4
feat: add method selector, form and handler funtions for standard jso…
IOVgomezdn Feb 25, 2024
3f67ba6
fix: minor styling
IOVgomezdn Feb 25, 2024
a7fd8c3
feat: add removed status and description
IOVgomezdn Feb 25, 2024
2e8151b
fix: download button were modified and some icons were added to be ce…
krlz16 Feb 26, 2024
49f05b5
Merge pull request #194 from rsksmart/feat/verify-with-standard-json-…
krlz16 Feb 26, 2024
cb5c5fa
fix: the values in the radiogroup were inverted
krlz16 Feb 26, 2024
d93c82b
fix: test.sol file deleted
krlz16 Feb 26, 2024
c5330fa
Merge branch 'feat/responsive-design' into feat/apps-view
krlz16 Feb 26, 2024
0240f93
fix: .env reseted
krlz16 Feb 26, 2024
b50e3d1
Merge branch 'feat/apps-view' into fix/styles-issues
krlz16 Feb 26, 2024
f61bede
fix: search styles added
krlz16 Feb 26, 2024
c4efae4
staging branch
krlz16 Feb 26, 2024
e298aa8
Merge branch 'feat/tx-pending-add-removed-status-display' of github.c…
IOVgomezdn Feb 26, 2024
0c59888
feat: adding dynamic applications according to the network
krlz16 Feb 26, 2024
a5a280c
feat: adding dynamic applications according to the network
krlz16 Feb 26, 2024
3cbfa36
Merge branch 'explorer-v2.1' into feat/apps-view
krlz16 Feb 26, 2024
4aa41e5
Merge pull request #188 from rsksmart/feat/responsive-design
nicov-iov Feb 26, 2024
e90ccb2
Merge branch 'explorer-v2' into fix/styles-issues
krlz16 Feb 26, 2024
29be53a
Merge branch 'develop' into fix/styles-issues
krlz16 Feb 26, 2024
db63c50
fix: remove unneeded console.log
IOVgomezdn Feb 26, 2024
70d5775
fix: comments deleted
krlz16 Feb 26, 2024
dadb3a2
fix: Scroll effect was removed, app view updated
krlz16 Feb 27, 2024
2604fa6
fix: adding effect that the default scroll has
krlz16 Feb 27, 2024
a22de58
fix: loader styles fixed
krlz16 Feb 27, 2024
0bcb362
Merge branch 'fix/styles-issues' into explorer-v2.1
krlz16 Feb 27, 2024
3f3c41d
Merge branch 'feat/apps-view' into explorer-v2.1
krlz16 Feb 27, 2024
ddc6e55
fix:
krlz16 Feb 28, 2024
8afb158
fix: icon search input fixed
krlz16 Feb 28, 2024
aa5c889
Merge pull request #200 from rsksmart/fix/issues
IOVgomezdn Feb 28, 2024
76937d1
fix: console.log deleted
krlz16 Feb 28, 2024
555a026
fix: adding gap between tx pending and icon
krlz16 Feb 28, 2024
5f8dce7
fix: styles were added to the tx status
krlz16 Feb 28, 2024
ebe8df2
fix: pool graph and table adapted to responsive
krlz16 Feb 28, 2024
3914887
feat: adding domain to stats
krlz16 Feb 28, 2024
0be2f9d
feat: adding domain stats in testnet config
krlz16 Feb 28, 2024
956e746
feat: use new URLs
lucasvuotto Feb 28, 2024
f547b5f
Merge pull request #201 from rsksmart/feat/new-urls
IOVgomezdn Feb 28, 2024
e74b028
remove circleci/config.yml
IOVgomezdn Feb 28, 2024
ee3717a
Merge pull request #202 from rsksmart/explorer-v2.1
ezequiel-rodriguez Feb 28, 2024
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
37 changes: 0 additions & 37 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions .env.mainnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VUE_APP_WS_URL=wss://be.explorer.mainnet.rsk.co
VUE_APP_WS_URL=wss://be.explorer.rootstock.io
VUE_APP_APPS_URL=""
VUE_APP_STATS_URL=https://stats.rsk.co
VUE_APP_STATS_URL=https://stats.rootstock.io
VUE_APP_GA_TAG=GTM-56J7JTD
VUE_APP_HOTJAR_ID=1857874
VUE_APP_STREAM_MITM_URL=/mitm/index.html
VUE_APP_DOMAIN_TESTNET='https://explorer.testnet.rootstock.io/'
VUE_APP_DOMAIN_MAINNET='https://explorer.rootstock.io/'
VUE_APP_DOMAIN_STATS_TESTNET='https://stats.testnet.rootstock.io/'
VUE_APP_DOMAIN_STATS_MAINNET='https://stats.rootstock.io/'
8 changes: 6 additions & 2 deletions .env.testnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
VUE_APP_WS_URL=wss://be.explorer.testnet.rsk.co
VUE_APP_WS_URL=wss://be.explorer.testnet.rootstock.io
VUE_APP_APPS_URL=https://apps.explorer.testnet.rsk.co
VUE_APP_STATS_URL=https://stats.testnet.rsk.co
VUE_APP_STATS_URL=https://stats.testnet.rootstock.io
VUE_APP_GA_TAG=UA-136026316-1
VUE_APP_HOTJAR_ID=1901396
VUE_APP_STREAM_MITM_URL=/mitm/index.html
VUE_APP_DOMAIN_TESTNET='https://explorer.testnet.rootstock.io/'
VUE_APP_DOMAIN_MAINNET='https://explorer.rootstock.io/'
VUE_APP_DOMAIN_STATS_TESTNET='https://stats.testnet.rootstock.io/'
VUE_APP_DOMAIN_STATS_MAINNET='https://stats.rootstock.io/'
Loading
Loading