Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dev with most recent dev changes #968

Merged
merged 6 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- main
- 'stable/*'
- dev-v3.5.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this for when it's merged in?


env:
REGISTRY: ghcr.io
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Figure out a link that will work when the dev branch is deleted (tags?)


### 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))
Expand All @@ -25,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.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Thetwam marked this conversation as resolved.
Show resolved Hide resolved

# set up the database
migrate:
Expand Down
4 changes: 2 additions & 2 deletions assets/js/Components/Preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ class Preview extends React.Component {
}

highlightHtml(issueHtml, previewHtml) {
const highlighted = `<span class="highlighted" style="display:inline-block; border:5px dashed #F1F155;">${issueHtml}</span>`
const highlighted = `<span class="highlighted" style="display:inline-block; border:3px dashed #B3002D;">${issueHtml}</span>`
try {
previewHtml = previewHtml.replace(issueHtml, highlighted)
} catch (error) {
console.log(error)
}

return previewHtml
}

Expand Down
Loading