From 6110a21f1d78da75c7d39e83e6d221c491a20821 Mon Sep 17 00:00:00 2001 From: Daniel Molares <70301465+dmols@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:51:50 -0400 Subject: [PATCH 1/6] Update ci.yml to test new features in dev --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df80c8c6..926b61bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: branches: - main - 'stable/*' + - dev-v3.5.0 env: REGISTRY: ghcr.io From 93f4bdd3b64be23392a0fc16a3df5b4f9f057217 Mon Sep 17 00:00:00 2001 From: Daniel Molares Date: Tue, 5 Nov 2024 19:07:56 -0500 Subject: [PATCH 2/6] Changed highlight color for alt text UFIXIT form + changed makefile command to show start-up progress --- .env.example | 2 +- CHANGELOG.md | 1 + Makefile | 2 +- assets/js/Components/Preview.js | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 1d88c4e0..8369ce36 100644 --- a/.env.example +++ b/.env.example @@ -40,7 +40,7 @@ APP_LTI_REDIRECT_PATH="/lti/authorize/check" APP_LTI_NAME="UDOIT 3" ADMIN_LTI_NAME="UDOIT 3 Admin" USE_DEVELOPMENT_AUTH="no" -VERSION_NUMBER="3.3.1" +VERSION_NUMBER="3.5.0" ###> symfony/messenger ### diff --git a/CHANGELOG.md b/CHANGELOG.md index ddbe8f01..1960bb3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Please update this file as you open PRs and make changes to the codebase. Thank ### General +- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast (Thank you, @dmols) - Added TableNotEmpty rule and UFIXIT issue form to track tables with no content (Thank you, [@AlanFCMV](https://github.com/alanfcmv)) - Increased maximum file upload size allowed, from 1mb to 10mb (Thank you, [@taheralfayad](https://github.com/taheralfayad)) - Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before (Thank you, [@taheralfayad](https://github.com/taheralfayad)) diff --git a/Makefile b/Makefile index a9f30eaa..3e2961d8 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ endif # spin up the containers start: - docker compose -f docker-compose.nginx.yml up -d + docker compose -f docker-compose.nginx.yml up # set up the database migrate: diff --git a/assets/js/Components/Preview.js b/assets/js/Components/Preview.js index 857b948c..c0a01f21 100644 --- a/assets/js/Components/Preview.js +++ b/assets/js/Components/Preview.js @@ -78,13 +78,13 @@ class Preview extends React.Component { } highlightHtml(issueHtml, previewHtml) { - const highlighted = `${issueHtml}` + const highlighted = `${issueHtml}` try { previewHtml = previewHtml.replace(issueHtml, highlighted) } catch (error) { console.log(error) } - + return previewHtml } From 8982056eb4fdc920c7ce3efa981cde599d58699d Mon Sep 17 00:00:00 2001 From: Daniel Molares Date: Wed, 6 Nov 2024 11:12:04 -0500 Subject: [PATCH 3/6] Formatting changes to Makefile --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1960bb3f..25919cd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Change Log Please update this file as you open PRs and make changes to the codebase. Thank you! -## [Unreleased] +## [Unreleased](https://github.com/ucfopen/UDOIT/tree/dev) -## [3.5.0] +## [3.5.0](https://github.com/ucfopen/UDOIT/compare/stable/3.4.x...dev-v3.5.0) - 2024-11-12 ### General -- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast (Thank you, @dmols) +- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast (Thank you, [@dmols](https://github.com/dmols)) - Added TableNotEmpty rule and UFIXIT issue form to track tables with no content (Thank you, [@AlanFCMV](https://github.com/alanfcmv)) - Increased maximum file upload size allowed, from 1mb to 10mb (Thank you, [@taheralfayad](https://github.com/taheralfayad)) - Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before (Thank you, [@taheralfayad](https://github.com/taheralfayad)) @@ -26,4 +26,4 @@ Please update this file as you open PRs and make changes to the codebase. Thank - Upgraded php max_execution_time from 800M to 3500M, and fastcgi_read_timeout from 180 to 300, to allow for php to handle a larger amount of data, and having nginx wait longer for the processes to complete. (Thank you, [@dmols](https://github.com/dmols) and [@Thetwam](https://github.com/Thetwam)) ## Previous Releases -For the time being, please refer to [this page](https://github.com/ucfopen/UDOIT/releases) to view the changes made to previous UDOIT releases. +Please refer to [this page](https://github.com/ucfopen/UDOIT/releases) to view the changes made on previous UDOIT releases. From a43b60f18302e5d48feabbd2e06ae49d7b8cfc3e Mon Sep 17 00:00:00 2001 From: Daniel Molares Date: Wed, 6 Nov 2024 15:48:47 -0500 Subject: [PATCH 4/6] Added links to commits and PRs in CHANGELOG --- CHANGELOG.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25919cd4..d18ecc5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,27 +3,27 @@ Please update this file as you open PRs and make changes to the codebase. Thank you! ## [Unreleased](https://github.com/ucfopen/UDOIT/tree/dev) -## [3.5.0](https://github.com/ucfopen/UDOIT/compare/stable/3.4.x...dev-v3.5.0) - 2024-11-12 +## [3.5.0](https://github.com/ucfopen/UDOIT/compare/3.4.0...3.5.0) - 2024-11-12 ### General -- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast (Thank you, [@dmols](https://github.com/dmols)) -- Added TableNotEmpty rule and UFIXIT issue form to track tables with no content (Thank you, [@AlanFCMV](https://github.com/alanfcmv)) -- Increased maximum file upload size allowed, from 1mb to 10mb (Thank you, [@taheralfayad](https://github.com/taheralfayad)) -- Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before (Thank you, [@taheralfayad](https://github.com/taheralfayad)) -- Updated outdated dependencies (Thank you, [@dmols](https://github.com/dmols)) -- Previously, the browser console would relay the data captured in the course, on initial scan. The console log has been removed since, to allow for better data security (Thank you, [@dmols](https://github.com/dmols)) -- Allow UDOIT to accept modern file types to be uploaded, such as those with extensions pptx, xlsx, docx (Thank you, [@taheralfayad](https://github.com/taheralfayad)) -- Added a CHANGELOG file to keep better track of the codebase changes (Thank you, [@dmols](https://github.com/dmols)) -- Made changes to `INSTALL_CANVAS.md` and `INSTALL.md` files to make the installation process a little easier to follow. (Thank you [@SimHoZebs](https://github.com/SimHoZebs)) -- Added `Makefile` to speed up development process (Thank you, [@SimHoZebs](https://github.com/SimHoZebs)) +- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast, in [this commit](https://github.com/ucfopen/UDOIT/commit/93f4bdd3b64be23392a0fc16a3df5b4f9f057217) (Thank you, [@dmols](https://github.com/dmols)) +- Added TableNotEmpty rule and UFIXIT issue form to track tables with no content [#725](https://github.com/ucfopen/UDOIT/pull/725) (Thank you, [@AlanFCMV](https://github.com/alanfcmv)) +- Increased maximum file upload size allowed, from 1mb to 10mb [#944](https://github.com/ucfopen/UDOIT/pull/944) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) +- Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before [#938](https://github.com/ucfopen/UDOIT/pull/938) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) +- Updated outdated dependencies [#947](https://github.com/ucfopen/UDOIT/pull/947) (Thank you, [@dmols](https://github.com/dmols)) +- Previously, the browser console would relay the data captured in the course, on initial scan. The console log has been removed since, to allow for better data security [#946](https://github.com/ucfopen/UDOIT/pull/946) (Thank you, [@dmols](https://github.com/dmols)) +- Allow UDOIT to accept modern file types to be uploaded, such as those with extensions pptx, xlsx, docx [#943](https://github.com/ucfopen/UDOIT/pull/943) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) +- Added a CHANGELOG file to keep better track of the codebase changes [#957](https://github.com/ucfopen/UDOIT/pull/957) (Thank you, [@dmols](https://github.com/dmols)) +- Made changes to `INSTALL_CANVAS.md` and `INSTALL.md` files to make the installation process a little easier to follow [#950](https://github.com/ucfopen/UDOIT/pull/950) (Thank you [@SimHoZebs](https://github.com/SimHoZebs)) +- Added `Makefile` to speed up development process [#958](https://github.com/ucfopen/UDOIT/pull/958) (Thank you, [@SimHoZebs](https://github.com/SimHoZebs)) ### Bugfixes -- Fixed issue where more than one resolved issue in the UFIXIT modal can remain. Before, the modal would only show the most recent one resolved. (Thank you, [@ssciolla](https://github.com/ssciolla)) -- Fixed case where navigating through issues on UFIXIT modal would be difficult or impossible when one is marked as fixed, since the modal will jump back to the resolved one. (Thank you, [@ssciolla](https://github.com/ssciolla)) -- Fixed issue where adding a Youtube API key to your .env file would not make UDOIT automatically consider issues revolving youtube captioning. This was resolved by allowing a 'Full Course Rescan' option in the dropdown menu of the UDOIT welcome screen (Thank you, [@taheralfayad](https://github.com/taheralfayad)) -- Upgraded php max_execution_time from 800M to 3500M, and fastcgi_read_timeout from 180 to 300, to allow for php to handle a larger amount of data, and having nginx wait longer for the processes to complete. (Thank you, [@dmols](https://github.com/dmols) and [@Thetwam](https://github.com/Thetwam)) +- Fixed issue where more than one resolved issue in the UFIXIT modal can remain. Before, the modal would only show the most recent one resolved [#892](https://github.com/ucfopen/UDOIT/pull/892) (Thank you, [@ssciolla](https://github.com/ssciolla)) +- Fixed case where navigating through issues on UFIXIT modal would be difficult or impossible when one is marked as fixed, since the modal will jump back to the resolved one [#888](https://github.com/ucfopen/UDOIT/pull/888) (Thank you, [@ssciolla](https://github.com/ssciolla)) +- Fixed issue where adding a Youtube API key to your .env file would not make UDOIT automatically consider issues revolving youtube captioning. This was resolved by allowing a 'Full Course Rescan' option in the dropdown menu of the UDOIT welcome screen [#898](https://github.com/ucfopen/UDOIT/pull/898) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) +- Upgraded php `memory_limit` from 800M to 3500M, and both `max_execution_time` and `fastcgi_read_timeout` from 180 to 300, to allow for php to handle a larger amount of data, and having nginx wait longer for the processes to complete. Changes seen in [this commit](https://github.com/ucfopen/UDOIT/commit/d6c71b59dc3a353fc3d18b048473e1e09bcef423) (Thank you, [@dmols](https://github.com/dmols) and [@Thetwam](https://github.com/Thetwam)) ## Previous Releases Please refer to [this page](https://github.com/ucfopen/UDOIT/releases) to view the changes made on previous UDOIT releases. From db1f864e68acdefbf9cbdc49a73da7b4f985e806 Mon Sep 17 00:00:00 2001 From: Daniel Molares Date: Wed, 6 Nov 2024 15:56:45 -0500 Subject: [PATCH 5/6] Removed image generation process for branch push --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 926b61bb..df80c8c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: branches: - main - 'stable/*' - - dev-v3.5.0 env: REGISTRY: ghcr.io From 12c184ea58520bb8518a0cef9f801a39ff1c471e Mon Sep 17 00:00:00 2001 From: Daniel Molares Date: Tue, 12 Nov 2024 10:32:52 -0500 Subject: [PATCH 6/6] Added final fixes and altered some CHANGELOG entries --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d18ecc5a..2e2ff0c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ Please update this file as you open PRs and make changes to the codebase. Thank ### General -- Changed highlight color of 'alt text' for the UFIXIT form to meet all accessibility standards for color contrast, in [this commit](https://github.com/ucfopen/UDOIT/commit/93f4bdd3b64be23392a0fc16a3df5b4f9f057217) (Thank you, [@dmols](https://github.com/dmols)) +- Changed element highlight color in UFIXIT form to meet all accessibility standards for color contrast, in [this commit](https://github.com/ucfopen/UDOIT/commit/93f4bdd3b64be23392a0fc16a3df5b4f9f057217) (Thank you, [@dmols](https://github.com/dmols)) - Added TableNotEmpty rule and UFIXIT issue form to track tables with no content [#725](https://github.com/ucfopen/UDOIT/pull/725) (Thank you, [@AlanFCMV](https://github.com/alanfcmv)) - Increased maximum file upload size allowed, from 1mb to 10mb [#944](https://github.com/ucfopen/UDOIT/pull/944) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) - Changed the description of 'ParagraphNotUsedAsHeader' rule to be less ambiguous since UDOIT has flagged this issue incorrectly before [#938](https://github.com/ucfopen/UDOIT/pull/938) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) @@ -16,14 +16,15 @@ Please update this file as you open PRs and make changes to the codebase. Thank - Allow UDOIT to accept modern file types to be uploaded, such as those with extensions pptx, xlsx, docx [#943](https://github.com/ucfopen/UDOIT/pull/943) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) - Added a CHANGELOG file to keep better track of the codebase changes [#957](https://github.com/ucfopen/UDOIT/pull/957) (Thank you, [@dmols](https://github.com/dmols)) - Made changes to `INSTALL_CANVAS.md` and `INSTALL.md` files to make the installation process a little easier to follow [#950](https://github.com/ucfopen/UDOIT/pull/950) (Thank you [@SimHoZebs](https://github.com/SimHoZebs)) -- Added `Makefile` to speed up development process [#958](https://github.com/ucfopen/UDOIT/pull/958) (Thank you, [@SimHoZebs](https://github.com/SimHoZebs)) +- Added `Makefile` to speed up development process [#958](https://github.com/ucfopen/UDOIT/pull/958) (Thank you, [@SimHoZebs](https://github.com/SimHoZebs))\ +- Dependabot bumped `ws` package from 6.2.2 to 6.2.3 in [this commit](https://github.com/ucfopen/UDOIT/commit/2c6962f336e437f3bdffa42534f7235f01bd3c3a) ### Bugfixes - Fixed issue where more than one resolved issue in the UFIXIT modal can remain. Before, the modal would only show the most recent one resolved [#892](https://github.com/ucfopen/UDOIT/pull/892) (Thank you, [@ssciolla](https://github.com/ssciolla)) - Fixed case where navigating through issues on UFIXIT modal would be difficult or impossible when one is marked as fixed, since the modal will jump back to the resolved one [#888](https://github.com/ucfopen/UDOIT/pull/888) (Thank you, [@ssciolla](https://github.com/ssciolla)) - Fixed issue where adding a Youtube API key to your .env file would not make UDOIT automatically consider issues revolving youtube captioning. This was resolved by allowing a 'Full Course Rescan' option in the dropdown menu of the UDOIT welcome screen [#898](https://github.com/ucfopen/UDOIT/pull/898) (Thank you, [@taheralfayad](https://github.com/taheralfayad)) -- Upgraded php `memory_limit` from 800M to 3500M, and both `max_execution_time` and `fastcgi_read_timeout` from 180 to 300, to allow for php to handle a larger amount of data, and having nginx wait longer for the processes to complete. Changes seen in [this commit](https://github.com/ucfopen/UDOIT/commit/d6c71b59dc3a353fc3d18b048473e1e09bcef423) (Thank you, [@dmols](https://github.com/dmols) and [@Thetwam](https://github.com/Thetwam)) +- Increased php `memory_limit` from 800M to 3500M, and both `max_execution_time` and `fastcgi_read_timeout` from 180 to 300, to allow for php to handle a larger amount of data, and having nginx wait longer for the processes to complete. Changes seen in [this commit](https://github.com/ucfopen/UDOIT/commit/d6c71b59dc3a353fc3d18b048473e1e09bcef423) (Thank you, [@dmols](https://github.com/dmols) and [@Thetwam](https://github.com/Thetwam)) ## Previous Releases Please refer to [this page](https://github.com/ucfopen/UDOIT/releases) to view the changes made on previous UDOIT releases.