From c922f17c55d25af8ebe52a6f7e2df8be0669d670 Mon Sep 17 00:00:00 2001 From: Eric Franz Date: Mon, 30 Mar 2020 14:15:18 -0400 Subject: [PATCH 1/2] CHANGELOG: regenerating Apache conf & maint mode --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50c8532489..187e94cfda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [1.7.7] - 2020-03-30 ### Fixed - Use legal job names in job submission rake task [#341](https://github.com/OSC/ondemand/issues/341) and [#355](https://github.com/OSC/ondemand/pull/355) +- Support sanitizing job names of batch connect apps with `OOD_JOB_NAME_ILLEGAL_CHARS` env var [#429](https://github.com/OSC/ondemand/pull/429) - Add CSRF protection via CSRF token and Origin checking when creating shell app websocket connection [#444](https://github.com/OSC/ondemand/commit/1816de76fdf8bcec21d5f9619f5a3a09ff8db01d) and [#452](https://github.com/OSC/ondemand/pull/452) +- Fix JoyRide tooltip positioning for the Job Composer [#396](https://github.com/OSC/ondemand/pull/396) ### Changed +- Regenerate `ood_portal.conf` whenever Apache is restarted [#371](https://github.com/OSC/ondemand/pull/371). + This means you can edit `/etc/ood/config/ood-portal.conf` and restart Apache and your change should take effect. - Upgrade Rails to version 5.2 (from 4.2) * Dashboard [#374](https://github.com/OSC/ondemand/pull/374) * Active Jobs [#378](https://github.com/OSC/ondemand/pull/378) @@ -30,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Alert for invalid clusters [#427](https://github.com/OSC/ondemand/pull/427) - SSH Wrapper [#406](https://github.com/OSC/ondemand/pull/406) - Regenerate ood-portal.conf when apache starts or reloads [#371](https://github.com/OSC/ondemand/pull/371) +- Maintenance Mode for OnDemand [#370](https://github.com/OSC/ondemand/pull/370) ## [1.7.6] - 2019-12-20 ### Fixed From bd8d5b03dfd933a0947db8f459b0568eddf1d6be Mon Sep 17 00:00:00 2001 From: Eric Franz Date: Mon, 30 Mar 2020 14:18:12 -0400 Subject: [PATCH 2/2] reference @baverhey in CHANGELOG for feature addition --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 187e94cfda..7ef844691f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. [#432](https://github.com/OSC/ondemand/pull/432) - Action column with delete button in active jobs [#423](https://github.com/OSC/ondemand/pull/423) - Alert for invalid clusters [#427](https://github.com/OSC/ondemand/pull/427) -- SSH Wrapper [#406](https://github.com/OSC/ondemand/pull/406) +- Configurable SSH Wrapper for Shell app @baverhey [#406](https://github.com/OSC/ondemand/pull/406) - Regenerate ood-portal.conf when apache starts or reloads [#371](https://github.com/OSC/ondemand/pull/371) - Maintenance Mode for OnDemand [#370](https://github.com/OSC/ondemand/pull/370)