* simon/cpfp-frontend: (46 commits)
Bugfix: Don't extend already extended transactions to not override the firstSeen property. fixes#390
Shuffle mempool transactions before saving disk cache. (#398)
Adding missing return after expressjs response.
CPFP support (#395)
Round sat/vB in fee rating tooltip. fixes#364
Add the GNU AGPLv3 logo to About page
Update package.json license tags
Add recommended fee percentile config (#394)
Fix typo in README (#392)
Fix icon for Specter Wallet on About page
Add link to Specter Wallet on our About page
Add link to WARden Portfolio app as Community Integration on About page
Delete MIT+CC license from Terms of Service, add AGPLv3 to About page
Change mempool project license to GNU Affero General Public License v3
Lower volume for sound effects (#385)
Improve grammar, layout, and formatting of Terms of Service page
Display all Project Contributors on About page using GitHub API (#382)
Modify nginx.conf to cache HTML for 10m and static resources for 1h
Proxy /api/v1/contributors from mempool.space, also fix HTTP headers
Add link to Bisq's GitHub repo on About page
...
* CPFP support.
fixes#5fixes#353fixes#360
* Use effectiveFeePerVsize for mempool statistics.
* Renaming endpoint cpfp-info to just cpfp.
* Renaming decended to BestDescendant.
* Updating language file with new strings.
* master:
Tweak ASM opcode styling colors
Add some color and styling to the Bitcoin ASM opcodes
Correcting title text on graph invert button.
Modify upgrade script to include "tag @ hash" in notification msg
Adding a button to invert the graph globally.
Display P2PK instead of OP_RETURN fixes#161
Improved utxo script design. fixes#46
Adding prevout script. Fixed padding. refs #46
Correcting details button padding on mobile.
Fix nginx.conf reverse proxy cache URL path for sponsor images
Add missing "engines" metadata into package-lock.json
Upgrade backend/package-lock.json to version 2
Toggle display UTXO details and scripts for transactions fixes#46
Axios error handle sponsor proxy requests.
Replacing request.js with axios fixes#153
Add basic websocket error handler as emergency fix for site crashing
# Conflicts:
# frontend/src/app/services/storage.service.ts
softsimon
nymkappa
Miguel Medeiros
softsimon
wiz
Jonathan Underwood