Skip to content

Commit

Permalink
chore: merge staging into master #1040
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsANameToo authored Feb 16, 2022
2 parents 9e448ff + dc4efa4 commit e7fdb9c
Show file tree
Hide file tree
Showing 26 changed files with 631 additions and 699 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ EXPLORER_DB_PASSWORD=password
DEBUGBAR_ENABLED=false
RESPONSE_CACHE_ENABLED=false
TELESCOPE_ENABLED=false
DARK_MODE_ENABLED=true

HORIZON_ADDRESSES=

Expand Down
1 change: 1 addition & 0 deletions .env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ EXPLORER_DB_PASSWORD=password
DEBUGBAR_ENABLED=false
RESPONSE_CACHE_ENABLED=false
TELESCOPE_ENABLED=false
DARK_MODE_ENABLED=true
30 changes: 27 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,24 @@ All notable changes to this project will be documented in this file.

## [Unreleased Devnet](https://github.com/ArkEcosystem/explorer/compare/staging...develop)

## 2022-01-24 (Dexplorer)
## 2022-02-14 (Dexplorer)

### Fixed

- price graph height on the homepage ([#1033]) (491c9dfb, @leMaur)

### Changed

- remove supervisor for short-schedule ([#1035]) (8f88cf5c, @marianogoldman)
- add dark mode env var ([#1036]) (f4e5b463, @crnkovic)
- use layout head & body components ([#1034]) (31561f45, @alexbarnsley)
- update alpine ([#1016]) (0d159736, @alexbarnsley)
- update PHP dependencies ([#1031]) (9dc5df89, @faustbrian)
- update foundation and remove reddit links ([#1039]) (6d09d22, @itsanametoo)

---

## 2022-01-24 (Explorer + Dexplorer)

### Fixed

Expand Down Expand Up @@ -43,7 +60,7 @@ All notable changes to this project will be documented in this file.

---

## 2021-11-02 (Dexplorer)
## 2021-11-02 (Explorer + Dexplorer)

### Fixed

Expand Down Expand Up @@ -350,4 +367,11 @@ All notable changes to this project will be documented in this file.
[#1027]: https://github.com/ArkEcosystem/explorer/pull/1027
[#1028]: https://github.com/ArkEcosystem/explorer/pull/1028
[#1029]: https://github.com/ArkEcosystem/explorer/pull/1029
[#1030]: https://github.com/ArkEcosystem/explorer/pull/1030
[#1030]: https://github.com/ArkEcosystem/explorer/pull/1030
[#1033]: https://github.com/ArkEcosystem/explorer/pull/1033
[#1035]: https://github.com/ArkEcosystem/explorer/pull/1035
[#1036]: https://github.com/ArkEcosystem/explorer/pull/1036
[#1034]: https://github.com/ArkEcosystem/explorer/pull/1034
[#1016]: https://github.com/ArkEcosystem/explorer/pull/1016
[#1031]: https://github.com/ArkEcosystem/explorer/pull/1031
[#1031]: https://github.com/ArkEcosystem/explorer/pull/1039
2 changes: 1 addition & 1 deletion app/Repositories/Concerns/ManagesCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private function cacheKey(): string
'%s/%s-%s',
class_basename($this),
debug_backtrace()[2]['function'],
serialize(debug_backtrace()[2]['args'])
serialize(debug_backtrace()[2]['args'] ?? '')
);
}
}
24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
"php": "^8.0",
"ext-gmp": "*",
"arkecosystem/crypto": "^1.8",
"arkecosystem/foundation": "^1.0",
"blade-ui-kit/blade-icons": "^1.1",
"arkecosystem/foundation": "^3.1",
"blade-ui-kit/blade-icons": "^1.2",
"brick/math": "^0.9",
"doctrine/dbal": "^3.2",
"doctrine/dbal": "^3.3",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"laravel/framework": "^8.78",
"laravel/horizon": "^5.7",
"laravel/telescope": "^4.6",
"laravel/tinker": "^3.6",
"laravel/framework": "^8.0",
"laravel/horizon": "^5.8",
"laravel/telescope": "^4.7",
"laravel/tinker": "^3.7",
"leigh/mt-rand": "^0.1",
"mattiasgeniar/php-percentages": "^1.3",
"nyholm/psr7": "^1.4",
"nyholm/psr7": "^1.5",
"savvot/random": "^0.3",
"sentry/sentry-laravel": "^2.10",
"spatie/laravel-responsecache": "^7.1",
"sentry/sentry-laravel": "^2.11",
"spatie/laravel-responsecache": "^7.2",
"symfony/psr-http-message-bridge": "^2.1"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
"facade/ignition": "^2.17",
"furqansiddiqui/bip39-mnemonic-php": "^0.1",
"laravel/dusk": "^6.20",
"wnx/laravel-stats": "^2.7"
"laravel/dusk": "^6.22",
"wnx/laravel-stats": "^2.8"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading

0 comments on commit e7fdb9c

Please sign in to comment.