Skip to content

Commit

Permalink
Bug fixes for v2.2.0 (exodus4d#81)
Browse files Browse the repository at this point in the history
* util.js: decode shipname for popover

* Bump version to 2.2.0

* Bump react/promise-stream from 1.2.0 to 1.3.0 (exodus4d#46)

Bumps [react/promise-stream](https://github.com/reactphp/promise-stream) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/reactphp/promise-stream/releases)
- [Changelog](https://github.com/reactphp/promise-stream/blob/master/CHANGELOG.md)
- [Commits](reactphp/promise-stream@v1.2.0...v1.3.0)

---
updated-dependencies:
- dependency-name: react/promise-stream
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump monolog/monolog from 2.3.4 to 2.3.5 (exodus4d#37)

Bumps [monolog/monolog](https://github.com/Seldaek/monolog) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/Seldaek/monolog/releases)
- [Changelog](https://github.com/Seldaek/monolog/blob/main/CHANGELOG.md)
- [Commits](Seldaek/monolog@2.3.4...2.3.5)

---
updated-dependencies:
- dependency-name: monolog/monolog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <[email protected]>

* Bump slash from 3.0.0 to 4.0.0 (exodus4d#34)

Bumps [slash](https://github.com/sindresorhus/slash) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/sindresorhus/slash/releases)
- [Commits](sindresorhus/slash@v3.0.0...v4.0.0)

---
updated-dependencies:
- dependency-name: slash
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gulp-imagemin from 7.1.0 to 8.0.0 (exodus4d#33)

Bumps [gulp-imagemin](https://github.com/sindresorhus/gulp-imagemin) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/sindresorhus/gulp-imagemin/releases)
- [Commits](sindresorhus/gulp-imagemin@v7.1.0...v8.0.0)

---
updated-dependencies:
- dependency-name: gulp-imagemin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gulp-sourcemaps from 2.6.5 to 3.0.0 (exodus4d#32)

Bumps [gulp-sourcemaps](https://github.com/gulp-sourcemaps/gulp-sourcemaps) from 2.6.5 to 3.0.0.
- [Release notes](https://github.com/gulp-sourcemaps/gulp-sourcemaps/releases)
- [Commits](gulp-sourcemaps/gulp-sourcemaps@v2.6.5...v3.0.0)

---
updated-dependencies:
- dependency-name: gulp-sourcemaps
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gulp-filter from 6.0.0 to 7.0.0 (exodus4d#30)

Bumps [gulp-filter](https://github.com/sindresorhus/gulp-filter) from 6.0.0 to 7.0.0.
- [Release notes](https://github.com/sindresorhus/gulp-filter/releases)
- [Commits](sindresorhus/gulp-filter@v6.0.0...v7.0.0)

---
updated-dependencies:
- dependency-name: gulp-filter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump gulp-autoprefixer from 7.0.1 to 8.0.0 (exodus4d#31)

Bumps [gulp-autoprefixer](https://github.com/sindresorhus/gulp-autoprefixer) from 7.0.1 to 8.0.0.
- [Release notes](https://github.com/sindresorhus/gulp-autoprefixer/releases)
- [Commits](sindresorhus/gulp-autoprefixer@v7.0.1...v8.0.0)

---
updated-dependencies:
- dependency-name: gulp-autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <[email protected]>

* Bump cache/filesystem-adapter from 1.0.0 to 1.1.0 (exodus4d#29)

Bumps [cache/filesystem-adapter](https://github.com/php-cache/filesystem-adapter) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/php-cache/filesystem-adapter/releases)
- [Changelog](https://github.com/php-cache/filesystem-adapter/blob/master/Changelog.md)
- [Commits](php-cache/filesystem-adapter@1.0.0...1.1.0)

---
updated-dependencies:
- dependency-name: cache/filesystem-adapter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <[email protected]>

* Bump react/socket from 1.3.0 to 1.9.0 (exodus4d#27)

Bumps [react/socket](https://github.com/reactphp/socket) from 1.3.0 to 1.9.0.
- [Release notes](https://github.com/reactphp/socket/releases)
- [Changelog](https://github.com/reactphp/socket/blob/master/CHANGELOG.md)
- [Commits](reactphp/socket@v1.3.0...v1.9.0)

---
updated-dependencies:
- dependency-name: react/socket
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <[email protected]>

* Bump cache/redis-adapter from 1.0.0 to 1.1.0 (exodus4d#28)

Bumps [cache/redis-adapter](https://github.com/php-cache/redis-adapter) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/php-cache/redis-adapter/releases)
- [Changelog](https://github.com/php-cache/redis-adapter/blob/master/Changelog.md)
- [Commits](php-cache/redis-adapter@1.0.0...1.1.0)

---
updated-dependencies:
- dependency-name: cache/redis-adapter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <[email protected]>

* requirements.ini: bumps memory requirement to 256M

* package.json: downgrades imagemin to 7.1.0

* package-lock.json: resolves npm-audit dependency warnings

* AbstractRallyWebhookHandler.php: Convert Truesec value to str

* CorporationModel.php: resets corporationStructureModel instance to avoid overwriting the same record

* Updates wormhole minimum jump mass

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
samoneilll and dependabot[bot] authored Dec 2, 2021
1 parent ee1cd18 commit 15a0fce
Show file tree
Hide file tree
Showing 226 changed files with 592 additions and 331 deletions.
2 changes: 1 addition & 1 deletion app/Lib/Logging/Handler/AbstractRallyWebhookHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected function getSlackData(array $record) : array {

if(!empty($objectData['objTrueSec'])){
// System trueSec
$attachment['fields'][] = $this->generateAttachmentField('TrueSec', $objectData['objTrueSec']);
$attachment['fields'][] = $this->generateAttachmentField('TrueSec', strval($objectData['objTrueSec']));
}

if(!empty($objectData['objCountPlanets'])){
Expand Down
4 changes: 4 additions & 0 deletions app/Model/Pathfinder/CorporationModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,10 @@ public function getById(int $id, int $ttl = self::DEFAULT_SQL_TTL, bool $isActiv
public function saveStructure(StructureModel $structure){
if( !$structure->dry() ){
$corporationStructure = $this->rel('corporationStructures');

// reset in case of potential "contiue" from parent loop
$corporationStructure->reset();

$corporationStructure->corporationId = $this;
$corporationStructure->structureId = $structure;
$corporationStructure->save();
Expand Down
4 changes: 2 additions & 2 deletions app/pathfinder.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ NAME = Pathfinder
; Version is used for CSS/JS cache busting and is part of the URL for static resources:
; e.g. public/js/vX.X.X/app.js
; Syntax: String (current version)
; Default: v2.1.4
VERSION = v2.1.4
; Default: v2.2.0
VERSION = v2.2.0

; Contact information [optional]
; Shown on 'licence', 'contact' page.
Expand Down
2 changes: 1 addition & 1 deletion app/requirements.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MAX_EXECUTION_TIME = 10

; max memory limit
; some requests e.g. build indexes on /setup page require more RAM
MEMORY_LIMIT = 128M
MEMORY_LIMIT = 256M

; max variable size for $_GET, $_POST and $_COOKIE
; this is required for importing larger maps
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"ikkez/f3-cortex": "dev-master#af035616ae8d708776117e05603dac43835f3d9a",
"ikkez/f3-sheet": "0.4.*",
"xfra35/f3-cron": "1.2.*",
"monolog/monolog": "2.3.4",
"monolog/monolog": "2.3.5",
"swiftmailer/swiftmailer": "6.2.*",
"league/html-to-markdown": "5.0.*",
"cache/redis-adapter": "1.0.*",
"cache/redis-adapter": "1.1.*",
"cache/filesystem-adapter": "1.0.*",
"cache/array-adapter": "1.1.*",
"cache/void-adapter": "1.0.*",
"cache/namespaced-cache": "1.1.*",
"react/socket": "1.3.*",
"react/socket": "1.9.*",
"react/promise-stream": "1.2.*",
"clue/ndjson-react": "1.2.*",
"firebase/php-jwt": "^5.4",
Expand Down
Loading

0 comments on commit 15a0fce

Please sign in to comment.