Skip to content

develop <- master (2.1.2) backmerge #490

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

Closed
wants to merge 1 commit into from
Closed

develop <- master (2.1.2) backmerge #490

wants to merge 1 commit into from

Conversation

peterkos
Copy link
Contributor

@peterkos peterkos commented Dec 25, 2020

This marks the change of no longer using version branches for HM, and using develop as our main dev branch!

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 [email protected]

Co-authored-by: Peter Kos [email protected]

  • fix: Fixes mobile agreements layout bug

Signed-off-by: Peter Kos [email protected]

Co-authored-by: Peter Kos [email protected]

  • 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 [email protected]
Co-authored-by: JeremyRudman [email protected]

  • 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 [email protected]

  • refactor: Removes old input hint

Co-authored-by: Peter Kos [email protected]

  • 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 [email protected]

Co-authored-by: Peter Kos [email protected]

Co-authored-by: JeremyRudman [email protected]
Co-authored-by: Chris Baudouin, Jr [email protected]
Co-authored-by: Jeremy Rudman [email protected]

* 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 <[email protected]>

Co-authored-by: Peter Kos <[email protected]>

* fix: Fixes mobile agreements layout bug

Signed-off-by: Peter Kos <[email protected]>

* feat: Removes semantic-release (#446)

* refactor: Moves CI to develop branch (#449)

Co-authored-by: Peter Kos <[email protected]>

* 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 <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>

* 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 <[email protected]>

* refactor: Removes old input hint

Co-authored-by: Peter Kos <[email protected]>

* 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 <[email protected]>

* fix(hakiri): fix hakiri error with user input in html_safe (#475)

Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: JeremyRudman <[email protected]>
Co-authored-by: Chris Baudouin, Jr <[email protected]>
Co-authored-by: Jeremy Rudman <[email protected]>
Copy link
Contributor

@JeremyRudman JeremyRudman left a comment

Choose a reason for hiding this comment

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

good code

@peterkos peterkos closed this Dec 25, 2020
@peterkos peterkos reopened this Dec 25, 2020
@peterkos peterkos closed this Dec 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants