7047 Commits

Author SHA1 Message Date
softsimon
48f24c878f Merge commit 'f151eb81c812a62d1d5c57ee91620a3dd9ae5068' into simon/angular-universal
* 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
2020-11-28 02:21:12 +07:00
softsimon
b2f9a4e47b Merge pull request #195 from mempool/wiz/angular-10.2.3
Upgrade angular from 10.0.4 to 10.2.3, typescript from 3.9.7 to 4.0.5
2020-11-28 02:09:52 +07:00
wiz
e0e818b002 Upgrade angular from 10.0.4 to 10.2.3, typescript from 3.9.7 to 4.0.5 2020-11-28 04:04:45 +09:00
wiz
0f275ccd1e Route all Angular Universal requests to nginx, remove simon's hacks 2020-11-27 23:03:48 +09:00
softsimon
6f2e398726 Hack to fix the urls. 2020-11-27 20:11:15 +07:00
softsimon
890c4ffdc9 Fix for non matching request URLs. 2020-11-27 20:01:25 +07:00
softsimon
5de3f63604 Adding ServerTransferStateModule for AU with custom http interceptor for cache transfer. 2020-11-27 18:41:57 +07:00
softsimon
5089ed3639 Merge pull request #189 from mempool/only-return-active-bisq-markets
Modify /bisq/api/v1/markets/markets to only return active markets
2020-11-23 22:02:13 +07:00
softsimon
46f957dddf removing /api again 2020-11-23 21:59:30 +07:00
wiz
c554f19a00 Modify /bisq/api/v1/markets/markets to only return active markets
As per https://github.com/bisq-network/bisq/issues/4826 and https://github.com/bisq-network/bisq/pull/4831
2020-11-23 22:46:14 +09:00
softsimon
ced9f20f64 Remove unnecessary @types/axios dependency. 2020-11-23 18:36:55 +07:00
softsimon
52beee3d2d New frontend config for webserver url to fix static asset httpGet.
Removed "absolute" from config names.
2020-11-23 18:22:21 +07:00
wiz
f4d07bcbc4 Same npm fix for running tsc from ./node_modules for backend 2020-11-23 17:26:22 +09:00
wiz
bdf578603a Set npm to run ng and tsc binaries from ./node_modules/ path 2020-11-23 17:19:16 +09:00
softsimon
9bd477d545 Remove ssr prepended url from asset service. 2020-11-23 15:04:41 +07:00
wiz
30d8a39eda Don't append /api to electrs backend path for SSR 2020-11-23 16:53:44 +09:00
softsimon
23bac4dc5e Update absolute url config variables. 2020-11-23 14:50:28 +07:00
softsimon
d6528460a8 Merge branch 'master' into simon/angular-universal
* 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
2020-11-23 14:08:50 +07:00
wiz
505d9e125a Merge pull request #186 from mempool/simon/update-pricefeed
Replace opennode usd price source with wiz api.
2020-11-23 16:06:15 +09:00
softsimon
f5058bc32e correcting merge 2020-11-23 11:46:04 +07:00
wiz
d63a503ac0 Merge pull request #185 from mempool/simon/liquid-fixes
Liquid asset display bug fixes
2020-11-23 10:11:43 +09:00
wiz
f1e5ae536e Merge remote-tracking branch 'origin/master' into simon/update-pricefeed 2020-11-23 09:56:23 +09:00
wiz
b2c3bdcb43 Remove extra space in price server URL 2020-11-23 09:48:06 +09:00
wiz
c8dc2d3287 Modify upgrade script to append repo before tag name 2020-11-23 09:46:50 +09:00
softsimon
ed1808ede8 Merge "getInitData" method from simon/angular-universal. 2020-11-23 02:38:56 +07:00
softsimon
d2cd595da6 Frontend config support for AU. New absolute server url settings.
refs #104
2020-11-23 02:30:46 +07:00
softsimon
bd1440ce96 Transaction, address and block page now works. 2020-11-22 23:47:27 +07:00
softsimon
24aed09489 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
2020-11-22 20:53:12 +07:00
softsimon
2176b358b9 Replace opennode usd price source with wiz api.
fixes #166
2020-11-22 16:48:55 +07:00
softsimon
6541379a84 Display confidential instead of nothing for confidential assets.
fixes #110
2020-11-22 16:30:36 +07:00
softsimon
11baac3ed0 Detect confidential assets and display properly.
fixes #109
2020-11-22 16:19:57 +07:00
softsimon
26773c45da Allow searching for and viewing assets not in the asset registry.
fixes #111
2020-11-22 16:03:23 +07:00
wiz
97a08cc6f2 Tweak ASM opcode styling colors 2020-11-21 18:17:29 +09:00
softsimon
4eada8c8c0 Merge pull request #184 from mempool/wiz/style-asm-opcodes
Add some color and styling to the Bitcoin ASM opcodes
2020-11-21 03:33:54 +07:00
wiz
7dbe7a7584 Add some color and styling to the Bitcoin ASM opcodes
Fixes #164
2020-11-21 05:29:50 +09:00
softsimon
647bb387ea Merge pull request #183 from mempool/wiz/angular-universal
Update `og:title` meta tag when changing page title
2020-11-20 00:46:04 +07:00
wiz
fe25d30f2e Update og:title meta tag when changing page title 2020-11-20 00:59:10 +09:00
softsimon
5818dce386 Correcting title text on graph invert button. 2020-11-16 21:58:16 +07:00
wiz
73d09da5d2 Modify upgrade script to include "tag @ hash" in notification msg 2020-11-16 23:44:32 +09:00
wiz
37b3efe37b Merge pull request #162 from mempool/simon/graph-inverter
Adding a button to invert the graph globally.
2020-11-16 21:37:57 +09:00
softsimon
c2982c0b46 Adding a button to invert the graph globally. 2020-11-16 19:27:06 +07:00
softsimon
bff1e1b97b Display P2PK instead of OP_RETURN
fixes #161
2020-11-16 16:21:37 +07:00
softsimon
75e770f50c Improved utxo script design.
fixes #46
2020-11-16 02:25:10 +07:00
softsimon
e946547c76 Adding prevout script. Fixed padding.
refs #46
2020-11-16 02:02:16 +07:00
softsimon
1c26f7e4ac Correcting details button padding on mobile. 2020-11-16 01:10:07 +07:00
wiz
2ccd218c00 Fix nginx.conf reverse proxy cache URL path for sponsor images 2020-11-16 00:43:10 +09:00
wiz
42d7241b75 Merge pull request #158 from mempool/simon/axios
Replacing request.js with axios
2020-11-16 00:37:43 +09:00
wiz
7c6c8f0f54 Merge remote-tracking branch 'origin/master' into simon/axios 2020-11-15 22:17:11 +09:00
wiz
920a6c1959 Merge pull request #159 from mempool/simon/utxo-details
Toggle display UTXO details and scripts for transactions
2020-11-15 22:11:44 +09:00
softsimon
da52c94365 Merge pull request #160 from mempool/wiz/upgrade-package-lock-json
Upgrade backend/package-lock.json to version 2
2020-11-15 19:26:18 +07:00