Skip to content

Commit 83f4a16

Browse files
committed
Merge remote-tracking branch 'origin/master' into shpaster/merge-master
2 parents 635d441 + e1888e7 commit 83f4a16

55 files changed

Lines changed: 3843 additions & 9638 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# 2.17.0
2+
3+
[All items](https://github.com/Azure/BatchExplorer/milestone/51?closed=1)
4+
5+
### Features
6+
7+
* Adds cloud service deprecation warning on pool details page [\#2716](https://github.com/Azure/BatchExplorer/issues/2716)
8+
* Removes custom themes [\#2715](https://github.com/Azure/BatchExplorer/issues/2715)
9+
* Adds developer menu item for Profiles [\#2714](https://github.com/Azure/BatchExplorer/issues/2714)
10+
* Accessibility improvements [\#2713](https://github.com/Azure/BatchExplorer/issues/2713)
11+
12+
### Bugs
13+
14+
* User was unable to upload package zip from batch explorer 2.16.1-stable.713 [\#2690](https://github.com/Azure/BatchExplorer/issues/2690)
15+
16+
# 2.16.1
17+
18+
* Test data caused storage account to show as "classic" [\#2659](https://github.com/Azure/BatchExplorer/issues/2659)
19+
120
# 2.16.0
221

322
[All items](https://github.com/Azure/BatchExplorer/milestone/50?closed=1)
@@ -614,7 +633,7 @@
614633
* Task progress not exposing validity of task count api [\#1475](https://github.com/Azure/BatchExplorer/issues/1475)
615634
* Ability to override the BatchLabs-data branch that we pull templates from [\#1474](https://github.com/Azure/BatchExplorer/issues/1474)
616635
* Use select query for task list to improve performance [\#1468](https://github.com/Azure/BatchExplorer/issues/1468)
617-
* Batch Account URI should have https:// prefix [\#1435](https://github.com/Azure/BatchExplorer/issues/1435)
636+
* Batch Account URI should have <https://> prefix [\#1435](https://github.com/Azure/BatchExplorer/issues/1435)
618637
* Task table column layout a little funky [\#1422](https://github.com/Azure/BatchExplorer/issues/1422)
619638
* BatchLabs: App splited in features that are can be enabled and disabled [\#1449](https://github.com/Azure/BatchExplorer/issues/1449)
620639
* BatchLabs one click node connect [\#1452](https://github.com/Azure/BatchExplorer/issues/1452)

desktop/ThirdPartyNotices.txt

Lines changed: 110 additions & 53 deletions
Large diffs are not rendered by default.

desktop/config/webpack.common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ exports.defineEnv = function(env) {
3535
"NODE_ENV": JSON.stringify(env),
3636
"RENDERER": JSON.stringify(true),
3737
"HOT": helpers.hasProcessFlag("hot"),
38+
"BE_ENABLE_A11Y_TESTING": process.env.BE_ENABLE_A11Y_TESTING,
3839
},
3940
});
4041
};

desktop/data/themes/classic.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "standard",
44
"primary": "#2F71C4",
55
"primary-contrast": "#ffffff",
6-
"danger": "#aa3939",
6+
"danger": "#bc2f34",
77
"danger-contrast": "#ffffff",
88
"warn": "#a46026",
99
"warn-contrast": "#ffffff",
@@ -18,7 +18,7 @@
1818
"border": "#919191",
1919
"editor": "vs",
2020
"text": {
21-
"primary": "#333333",
21+
"primary": "#323130",
2222
"secondary": "#666666"
2323
},
2424
"breadcrumb": {
@@ -53,16 +53,16 @@
5353
"disabled-bg": "#ededed"
5454
},
5555
"monitorChart": {
56-
"core-count": "#1c3f95",
56+
"core-count": "#004e8c",
5757
"low-priority-core-count": "#a36a00",
58-
"task-start-event": "#a36a00",
59-
"task-complete-event": "#428000",
60-
"task-fail-event": "#aa3939",
61-
"starting-node-count": "#1c3f95",
62-
"idle-node-count": "#be93d9",
63-
"running-node-count": "#428000",
64-
"start-task-failed-node-count": "#aa3939",
65-
"rebooting-node-count": "#ff755c"
58+
"task-start-event": "#6d5700",
59+
"task-complete-event": "#0f700f",
60+
"task-fail-event": "#bc2f34",
61+
"starting-node-count": "#004e8c",
62+
"idle-node-count": "#8764b8",
63+
"running-node-count": "#0f700f",
64+
"start-task-failed-node-count": "#bc2f34",
65+
"rebooting-node-count": "#d93c20"
6666
},
6767
"input": {
6868
"border": "#919191",
@@ -74,5 +74,5 @@
7474
"disabled-text": "var(--color-text-primary)",
7575
"disabled-background": "#e5e5e5"
7676
},
77-
"chart-colors": ["#003f5c", "#aa3939", "#4caf50", "#ffa600"]
77+
"chart-colors": ["#003f5c", "#bc2f34", "#4caf50", "#ffa600"]
7878
}

desktop/data/themes/dark.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
"primary": "#cccccc",
1515
"secondary": "#a7a8a9"
1616
},
17+
"monitorChart": {
18+
"core-count": "#0a95ff",
19+
"low-priority-core-count": "#ae8c00",
20+
"task-start-event": "#ae8c00",
21+
"task-complete-event": "#0a95ff",
22+
"task-fail-event": "#f26363",
23+
"starting-node-count": "#0a95ff",
24+
"idle-node-count": "#c674d2",
25+
"running-node-count": "#44a744",
26+
"start-task-failed-node-count": "#f26363",
27+
"rebooting-node-count": "#db7843"
28+
},
1729
"breadcrumb": {
1830
"text": "white",
1931
"background": "#5b5b5b",

desktop/definitions/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
declare type Environment = "production" | "development" | "test";
55
declare const ELECTRON_ENV: "renderer" | "main";
66

7-
// Gloval variables set by webpack
7+
// Global variables set by webpack
88
declare const ENV: Environment;
99

1010

0 commit comments

Comments
 (0)