Skip to content

Commit

Permalink
Merge pull request #2159 from Azure/master
Browse files Browse the repository at this point in the history
Merge master into stable for release 2.6.0
  • Loading branch information
cRui861 authored Feb 25, 2020
2 parents be7ef3a + ef51d3b commit a08db6a
Show file tree
Hide file tree
Showing 13 changed files with 282 additions and 184 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# 2.6.0
[All items](https://github.com/Azure/BatchExplorer/milestone/40?closed=1)

### feature:

* Display Unusable Node Banner on Pools Page [\#2153](https://github.com/Azure/BatchExplorer/issues/2153)
* Disable Auto-update with Command Line [\#2152](https://github.com/Azure/BatchExplorer/issues/2152)

### bug:

* PyInstaller Vulnerability [\#2155](https://github.com/Azure/BatchExplorer/issues/2155)
* Governance Updates [\#2154](https://github.com/Azure/BatchExplorer/issues/2154)

### other:

# 2.5.0
[All items](https://github.com/Azure/BatchExplorer/milestone/39?closed=1)

Expand Down
30 changes: 15 additions & 15 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Microsoft reserves all other rights not expressly granted under this agreement,
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -99,7 +99,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2019 Google LLC.
Copyright (c) 2020 Google LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -128,7 +128,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -157,7 +157,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -186,7 +186,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -215,7 +215,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -244,7 +244,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -273,7 +273,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2019 Google LLC.
Copyright (c) 2020 Google LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -302,7 +302,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -331,7 +331,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -360,7 +360,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -389,7 +389,7 @@ THE SOFTWARE.
------------------------------------------------------------
The MIT License

Copyright (c) 2010-2019 Google LLC. http://angular.io/license
Copyright (c) 2010-2020 Google LLC. http://angular.io/license

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -1718,7 +1718,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
------------------------------------------------------------
The MIT License (MIT)

Copyright (c) 2019 Microsoft Corporation
Copyright (c) 2016 - present Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -4218,7 +4218,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright,
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation;
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation;
All Rights Reserved" are retained in Python alone or in any derivative version
prepared by Licensee.

Expand Down Expand Up @@ -4405,7 +4405,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
============================================================
Start license for Electron
------------------------------------------------------------
Copyright (c) 2013-2019 GitHub Inc.
Copyright (c) 2013-2020 GitHub Inc.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
1 change: 1 addition & 0 deletions dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
owner: Azure
repo: BatchExplorer
provider: github
updaterCacheDirName: BatchExplorer-cache
Loading

0 comments on commit a08db6a

Please sign in to comment.