* commit 'f151eb81c812a62d1d5c57ee91620a3dd9ae5068':
Upgrade angular from 10.0.4 to 10.2.3, typescript from 3.9.7 to 4.0.5
Modify /bisq/api/v1/markets/markets to only return active markets
Remove unnecessary @types/axios dependency.
Same npm fix for running `tsc` from `./node_modules` for backend
Set npm to run `ng` and `tsc` binaries from `./node_modules/` path
# Conflicts:
# frontend/package-lock.json
# frontend/package.json
* master:
correcting merge
Remove extra space in price server URL
Modify upgrade script to append repo before tag name
Merge "getInitData" method from simon/angular-universal.
Replace opennode usd price source with wiz api. fixes#166
Display confidential instead of nothing for confidential assets. fixes#110
Detect confidential assets and display properly. fixes#109
Allow searching for and viewing assets not in the asset registry. fixes#111
# Conflicts:
# backend/src/api/websocket-handler.ts
* 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
* master:
Add the Commons Clause License Condition v1.0 to our MIT License
fix legend bug on resize
Correcting new chartist import path.
Flip mempool chart by using patched chartist package by @techmix
# Conflicts:
# frontend/package-lock.json