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 release into master #1677

Merged
merged 153 commits into from
Jun 27, 2023
Merged

Merge release into master #1677

merged 153 commits into from
Jun 27, 2023

Conversation

MeKHell
Copy link
Contributor

@MeKHell MeKHell commented Jun 20, 2023

The goal of this PR is to merge the release branch into the master one.
An intermediate branch has been created in order to revert some changes in FE1

Tyratox and others added 30 commits February 5, 2023 21:04
@Tyratox
Ensure attendee list is sorted
2e86a6e
@Tyratox
Merge branch 'work-fe1-nico-network-handler-try-catchs' into work-fe1…
0ae309d 
…-nico-sorted-attendee-list
@Tyratox
Update RollCall.ts
6ae6a61
@Tyratox
Refactor RollCall constructor
64726ea
@Tyratox
Fix test
240e73a
@Tyratox
Add bug fixes for issues discussed today
36c1b92
@dayan9265
remove offline mode when reconnected
795375a
@dayan9265
eslint fix
4b3fe90
@dayan9265
update test for reducer
4cef058
@dayan9265
eslint
7e7a7f9
@dayan9265
fix tests (require now high timeout)
4a77c7e
@MeKHell
Remove the Cash, and notifications
dea7a65
@Tyratox
try to fix the dependency issue
84774bb
@dayan9265
make the attendee list expandable
e5bcdb7
@dayan9265
update snapshot tests
0688ed8
@MeKHell
Merge pull request #1569 from dedis/work-fe1-mgreub-remove-elements-f…
638425b 
…or-release

Remove the cash, and notifications from the fe1 home screen
@dayan9265
Merge pull request #1573 from dedis/work-fe1-dmassonn-fix-expand-arro…
0c282d9 
…w-rollcall

Fix expand arrow roll call
@dayan9265
fix unwrapped long chirp + block trashcan when offline
ba2518b
@dayan9265
add possible solution + logs
c655c20
@K1li4nL
Add protocol copy dependency when running sbt assembly
b502d4a
@K1li4nL
Merge pull request #1589 from dedis/work-be2-lauener-CI-fix
db016e4 
Fix be2-scala deployment CI
@dayan9265
now also disconnect when offline
61d4c45
@dayan9265
add new line
0bf54d7
@dayan9265
display pop token
e931204
@dayan9265
update snap test
cb18869
@pierluca
Update CD pipeline to reflect infrastructure changes
a7fd4ee
@pierluca
Fixed missing deploy_env vars in CD pipeline
6344577
@dayan9265
Merge pull request #1595 from dedis/work-fe1-dmassonn-fix-offline-wro…
dcd5a6b 
…ngly-redirect

Fix offline wrongly redirect
@dayan9265
Merge branch 'release-2023-spring' into work-fe1-dmassonn-display-att…
d0d43d2 
…endee-id
@dayan9265
make word break more general
22362f1
@MeKHell MeKHell self-assigned this Jun 20, 2023
@MeKHell MeKHell requested a review from a team as a code owner June 20, 2023 16:55
@MeKHell
Copy link
Contributor Author

MeKHell commented Jun 20, 2023 •
edited
Loading

For FE1, I did not remove the "connect to test server button" since it should be done in another PR for traceability. I do not show the button again, because I think it should be removed and not useful anymore.

@MeKHell MeKHell marked this pull request as draft June 20, 2023 18:22
@MeKHell MeKHell marked this pull request as ready for review June 27, 2023 08:48
@MeKHell
Merge remote-tracking branch 'origin/master' into work-mgreub-merge-r…
6e342cd 
…elease-to-master

# Conflicts:
#	fe1-web/src/features/popcha/screens/__tests__/__snapshots__/PopchaScanner.test.tsx.snap
@MeKHell
Update snapshot for merge
8e07a82
@sonarcloud
Copy link

sonarcloud bot commented Jun 27, 2023

[PoP - PoPCHA-Web-Client] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@sonarcloud
Copy link

sonarcloud bot commented Jun 27, 2023

[PoP - Be1-Go] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@sonarcloud
Copy link

sonarcloud bot commented Jun 27, 2023

[PoP - Be2-Scala] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

50.0% 50.0% Coverage
0.0% 0.0% Duplication

@sonarcloud
Copy link

sonarcloud bot commented Jun 27, 2023

[PoP - Fe2-Android] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@sonarcloud
Copy link

sonarcloud bot commented Jun 27, 2023

[PoP - Fe1-Web] Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

77.5% 77.5% Coverage
0.0% 0.0% Duplication

@pierluca
Copy link
Contributor

Merging for analysis.

@pierluca pierluca merged commit 558be79 into master Jun 27, 2023
@pierluca pierluca deleted the work-mgreub-merge-release-to-master branch June 27, 2023 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@MeKHell MeKHell

Labels
be2-scala bug-fix Fixes a bug fe1-web
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MeKHell @pierluca @Tyratox @dayan9265 @K1li4nL