Skip to content

merge develop into master #534

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

Merged
merged 85 commits into from
Aug 5, 2022
Merged

merge develop into master #534

merged 85 commits into from
Aug 5, 2022

Conversation

rgwohlbold
Copy link
Contributor

@rgwohlbold rgwohlbold commented Jul 25, 2022

No description provided.

rgwohlbold and others added 30 commits May 16, 2022 09:13
* Add replyToMessageId to TCCMessage

* Add replyText to TCCMessage

* Add reply snippet to UI

* Make UI look even prettier by using the correct colors and slicing replySnippets

* Add class comment

* Use proper category for TCCCore>>getMessageById

* Adapt screenshot tests to new UI

* Make linter happy
* improve scene handling in authentication window

* rename button "Back" to button "Cancel"

Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
ignore passwordfield in tests

Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
Co-authored-by: TillB <[email protected]>
Co-authored-by: rgwohlbold <[email protected]>
@LucasDerReisende LucasDerReisende marked this pull request as ready for review August 5, 2022 14:27
@LucasDerReisende
Copy link
Contributor

Merging the work from Group 11 of the 2022 SWT I module into main

@LucasDerReisende LucasDerReisende merged commit 99e889e into master Aug 5, 2022
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.

5 participants