mirror of
https://github.com/mempool/mempool.git
synced 2025-10-10 08:23:23 +02:00
Merge branch 'master' into simon/angular-universal
* 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
This commit is contained in:
@@ -43,7 +43,7 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { FeesBoxComponent } from './components/fees-box/fees-box.component';
|
||||
import { DashboardComponent } from './dashboard/dashboard.component';
|
||||
import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
|
||||
import { faAngleDoubleDown, faAngleDoubleUp, faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faInfoCircle,
|
||||
import { faAngleDoubleDown, faAngleDoubleUp, faAngleDown, faAngleUp, faBolt, faChartArea, faCogs, faCubes, faDatabase, faExchangeAlt, faInfoCircle,
|
||||
faLink, faList, faSearch, faTachometerAlt, faThList, faTint, faTv } from '@fortawesome/free-solid-svg-icons';
|
||||
import { ApiDocsComponent } from './components/api-docs/api-docs.component';
|
||||
import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
|
||||
@@ -121,5 +121,6 @@ export class AppModule {
|
||||
library.addIcons(faTint);
|
||||
library.addIcons(faAngleDown);
|
||||
library.addIcons(faAngleUp);
|
||||
library.addIcons(faExchangeAlt);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user