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.

Sign up for GitHub

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

Jump to bottom

Merge Develop in Main #140

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Merge Develop in Main #140

merged 5 commits into from
Jan 23, 2024

Conversation

OliEfr
Copy link
Member

@OliEfr OliEfr commented Jan 23, 2024

Pull Request

Please fill out the following template when you create a PR. This will help to process your PR faster!

Description

I proprose the following changes in my PR:

  • Change 1
  • ...

Here you can also add screenshots, if applicable.

References

I created the PR because ...

Referenced Issue:

Referenced ToDo from project-board:

Type of change

  • Bug fix (non-breaking change which fixes a bug)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that might cause existing functionality to not work as expected)

Further info

  • This change requires a documentation update
  • I updated the documentation accordingly, if required
  • I commented my code where its useful

Testing

We have 1500+ Users. Please test your changes thoroughly.

  • Tested my changes on Firefox
  • Tested my changes on Chromium-Based-Browsers
  • Successfully run npm run test locally

Additional Information

Add anything here, that might be important.

OliEfr and others added 5 commits April 12, 2023 09:47
@OliEfr
fix _execute_action for ff
be3e567
@C0ntroller
Merge branch 'main' into develop
73b4b17
@A-K-O-R-A
Fix npm commands (#132)
139deec 
Thanks @A-K-O-R-A for noticing this bug and reporting it! Have a good day.
@A-K-O-R-A
Feature/add hover texts (#133)
bde0e56 
* Add hover texts for the popup icons

* Extend Informatik discord hover text

* Correct spelling
@C0ntroller
Add OTP support (#131)
755db8b 
* Add first classes for otp saving and generation

* Typo

* OTP saving complete

* Better OTP saving

* OTP filling

* Add recovery codes to prompt

* Eslint
@OliEfr OliEfr requested a review from a team as a code owner January 23, 2024 15:12
@OliEfr OliEfr requested a review from Noxdor January 23, 2024 15:12
@OliEfr OliEfr merged commit df4cf14 into main Jan 23, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Noxdor Noxdor Awaiting requested review from Noxdor Noxdor is a code owner automatically assigned from TUfast-TUD/coreteam

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OliEfr @C0ntroller @A-K-O-R-A