develop <- master (2.1.2) backmerge #490
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(questionnaire): missing information now in correct place (#443) * fix(questionnair): missing information now in correct place it now displays the correct message "Please read & accept" instead of missing information and the notification is now in the correct place * Update app/assets/javascripts/validate.js * Revert "Update app/assets/javascripts/validate.js" This reverts commit bc54783. Signed-off-by: Peter Kos <pkos91@icloud.com> Co-authored-by: Peter Kos <pkos91@icloud.com> * fix: Fixes mobile agreements layout bug Signed-off-by: Peter Kos <pkos91@icloud.com> * feat: Removes semantic-release (#446) * refactor: Moves CI to develop branch (#449) Co-authored-by: Peter Kos <pkos91@icloud.com> * build: Merges 2.1.2 into develop * fix(hakiri): corrected unescaped model attribute * fix(hakiri): added html_safe to show proper output Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> * fix: Shows questionnaires_closed_message on registration * feat: Allows agreements to be fully customizable (#465) * feat: Allows agreements to be fully customizable * fix: Fixes broken migrations * fix: Migrations misname issue * feat: Forces agreement links to open in new tab * Agreement validation detection fixed Signed-off-by: Peter Kos <pkos91@icloud.com> * refactor: Removes old input hint Co-authored-by: Peter Kos <pkos91@icloud.com> * fix(hakiri): fixed un-escaped regex for vcs link (#467) * fix(hakiri): corrected unescaped model attribute * fix(hakiri): added html_safe to show proper output * fix(hakiri): added \A \z to regex * fix(questionnaire): fixed hakiri error with vcs link regex * fix(questionnaire): fixed houndci commplaint Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> * fix(hakiri): fix hakiri error with user input in html_safe (#475) Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This marks the change of no longer using version branches for HM, and using
developas our main dev branch!fix(questionnaire): missing information now in correct place (fix(questionnaire): missing information now in correct place #443)
fix(questionnair): missing information now in correct place
it now displays the correct message "Please read & accept" instead of
missing information and the notification is now in the correct place
Update app/assets/javascripts/validate.js
Revert "Update app/assets/javascripts/validate.js"
This reverts commit bc54783.
Signed-off-by: Peter Kos pkos91@icloud.com
Co-authored-by: Peter Kos pkos91@icloud.com
Signed-off-by: Peter Kos pkos91@icloud.com
feat: Removes semantic-release (feat: Removes semantic-release #446)
refactor: Moves CI to develop branch (refactor: Moves CI to develop branch #449)
Co-authored-by: Peter Kos pkos91@icloud.com
build: Merges 2.1.2 into develop
fix(hakiri): corrected unescaped model attribute
fix(hakiri): added html_safe to show proper output
Co-authored-by: Jeremy Rudman jeremyrudman@gmail.com
Co-authored-by: JeremyRudman 38338616+JeremyRudman@users.noreply.github.com
fix: Shows questionnaires_closed_message on registration
feat: Allows agreements to be fully customizable (feat: Allows agreements to be fully customizable #465)
feat: Allows agreements to be fully customizable
fix: Fixes broken migrations
fix: Migrations misname issue
feat: Forces agreement links to open in new tab
Agreement validation detection fixed
Signed-off-by: Peter Kos pkos91@icloud.com
Co-authored-by: Peter Kos pkos91@icloud.com
fix(hakiri): fixed un-escaped regex for vcs link (fix(hakiri): fixed un-escaped regex for vcs link #467)
fix(hakiri): corrected unescaped model attribute
fix(hakiri): added html_safe to show proper output
fix(hakiri): added \A \z to regex
fix(questionnaire): fixed hakiri error with vcs link regex
fix(questionnaire): fixed houndci commplaint
Co-authored-by: Chris Baudouin, Jr cjb5326@rit.edu
Co-authored-by: Peter Kos pkos91@icloud.com
Co-authored-by: JeremyRudman 38338616+JeremyRudman@users.noreply.github.com
Co-authored-by: Chris Baudouin, Jr cjb5326@rit.edu
Co-authored-by: Jeremy Rudman jeremyrudman@gmail.com