Skip to content

Merge master into stable for release 2.8.0#2258

Merged
cRui861 merged 55 commits intostablefrom
master
Jan 19, 2021
Merged

Merge master into stable for release 2.8.0#2258
cRui861 merged 55 commits intostablefrom
master

Conversation

@cRui861
Copy link
Member

@cRui861 cRui861 commented Jan 15, 2021

No description provided.

cRui861 and others added 30 commits May 8, 2020 15:15
* Added new resourceGuids for Arnold and V-ray RT with correct prices
* WIP: adding gpu to possible list of units and replacing perCore

* Added gpu to list of units
* code clean up

* Added some function descriptions

* Added V-Ray RT to test cases and fixed pricing unit

* Cleaned code and fixed tests in pools-utils

* Updated billingUnit type to SoftwareBillingUnit
* Minor updates

* Minor linting fixes

* Updated billingUnit within softwareMeterId mapping

Co-authored-by: rechen <[email protected]>
Chromium no longer supports 8-bit color
This was lost in the dependency update PR
This was broken when upgrading electron-builder
Fixed Windows/Linux packaging issues
- Remove Python 2
- Upgrade to Node 12
- Ubuntu 16 -> 18
- MacOS 10.14 => 10.15
- Added a Python 3 venv for Linux/MacOS
- Replace electron-rebuild with electron-builder
Removed devtron as it is unmaintained and has Electron 9 issues.
Window indices did not seem to be consistent across OSes. Switched to detect each window by URL instead.
This was causing Electron to hang after tests complete
Update to Electron 9 and Spectron 11
This was broken due to a change on the AAD side of things
Fixed Splash Screen Stuck Issue - Mac
This addresses a security vulnerability in 'serialize-javascript'
* Fix serialize-javascript security issue

* Fix serialize-javascript security issue

* Dependency updates
* Minor build fix

* Minor update

* Minor changes
* Package-lock updates
dependabot bot and others added 20 commits September 17, 2020 09:48
Windows install scripts support paths with spaces
Fixes AB#379

When manually building a PR branch, underscores would cause the RPM
build to fail.
This allows multi-select deletion (and matches other left-hand lists like the pools list)
* maxTasksPerNode to taskSlotsPerNode variable and UI label changes

* Fixed Max Task Slots per Node labels to Task Slots per Node

* Updated taskslotspernode for test cases
* Todo: Update template.json files with remaining maxtaskpernode variable

* Add TaskCountResult and TaskSlotCount models

* Update files using JobTaskCounts to use JobTaskCountsResults
* Update JobProgressStatusComponent tests

* Add requiredSlots for job schedule create and display
* Update BatchService api version to latest
* Todo: Fix any breaking changes from api update
* WIP: working on requiredSlots changes for job and tasks

* Add requiredSlots field to task forms and config

* Add error messages for requiredSlots on jobManagerTask

* Cleanup comments

* Fix build issues and address PR comments

* Update taskSlotsPerNode min value error message
Add telemetry for when a user submits a render gallery operation.
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fixes AB#467: Contrast on InfoBox background
Fixes AB#434: Low Priority text contrast issues
Fixes AB#437: Account name suffix luminosity contrast issue

Co-authored-by: Shiran Pasternak <[email protected]>
Accessing Window.id after a window has been destroyed throws an error. Prevent this by checking if the window is destroyed first.
This fixes a race condition which could cause freezes on MacOS

See: paulmillr/chokidar#434
Fix occasional MacOS freezing issue on application startup
@codecov
Copy link

codecov bot commented Jan 15, 2021

Codecov Report

Merging #2258 (85b0241) into stable (13f6422) will increase coverage by 0.10%.
The diff coverage is 62.83%.

Impacted file tree graph

@@            Coverage Diff             @@
##           stable    #2258      +/-   ##
==========================================
+ Coverage   65.13%   65.23%   +0.10%     
==========================================
  Files         898      903       +5     
  Lines       25704    25684      -20     
  Branches     5072     5097      +25     
==========================================
+ Hits        16742    16756      +14     
+ Misses       8962     8928      -34     
Impacted Files Coverage Δ
src/@batch-flask/core/list/selectable-list.ts 100.00% <ø> (ø)
src/@batch-flask/core/material.module.ts 100.00% <ø> (ø)
src/@batch-flask/electron/electron-app.service.ts 11.11% <0.00%> (ø)
src/@batch-flask/electron/ipc.service.ts 10.00% <ø> (ø)
src/@batch-flask/electron/shell.service.ts 8.33% <0.00%> (-0.76%) ⬇️
...batch-flask/ui/abstract-list/abstract-list-base.ts 78.72% <ø> (+0.09%) ⬆️
...atch-flask/ui/abstract-list/list-base.component.ts 96.55% <ø> (+0.12%) ⬆️
src/@batch-flask/ui/buttons/button.component.ts 96.87% <ø> (ø)
src/@batch-flask/ui/buttons/buttons.component.ts 82.35% <ø> (+3.40%) ⬆️
...-flask/ui/buttons/clickable/clickable.component.ts 98.03% <ø> (ø)
... and 172 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 13f6422...85b0241. Read the comment docs.

@cRui861 cRui861 merged commit bbe801f into stable Jan 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants