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.

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

Dual licensing: AGPL + Element Commercial #3657

Merged
merged 3 commits into from
Jan 6, 2025

Conversation

manuroe
Copy link
Member

@manuroe manuroe commented Jan 2, 2025

Make it clear that the code is dual licensed.

There are 3 commits:

Copy link

github-actions bot commented Jan 2, 2025

Warnings
⚠️ This pull request seems relatively large. Please consider splitting it into multiple smaller ones.
⚠️ You seem to have made changes to views. Please consider adding screenshots.

Generated by 🚫 Danger Swift against 225f711

Copy link

sonarqubecloud bot commented Jan 2, 2025

@manuroe manuroe marked this pull request as ready for review January 2, 2025 11:04
@manuroe manuroe requested a review from a team as a code owner January 2, 2025 11:04
@manuroe manuroe requested review from pixlwave and removed request for a team January 2, 2025 11:04
Copy link

codecov bot commented Jan 2, 2025

❌ 1 Tests Failed:

Tests completed Failed Passed Skipped
908 1 907 0
View the full list of 1 ❄️ flaky tests
PreviewTests test_joinRoomScreen()

Flake rate in main: 19.57% (Passed 74 times, Failed 18 times)

Stack Traces | 2.69s run time
failed - Snapshot "Invite" does not match reference.

@−
"file:.../__Snapshots__/PreviewTests/test_joinRoomScreen-iPhone-16-pseudo.Invite.png"
@+
"file:.../tmp/PreviewTests/test_joinRoomScreen-iPhone-16-pseudo.Invite.png"

To configure output for a custom diff tool, use 'withSnapshotTesting'. For example:

    withSnapshotTesting(diffTool: .ksdiff) {
      // ...
    }

The percentage of pixels that match 0.9671936 is less than required 1.0
The lowest perceptual color precision 0.306875 is less than required 0.98 (PreviewTests/Sources/PreviewTests.swift:85)

To view more test analytics, go to the Test Analytics Dashboard
📢 Thoughts on this report? Let us know!

@manuroe manuroe added the pr-misc for other changes label Jan 2, 2025
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

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

LGTM, the find and replace caught both copies of the IDETemplateMacros.plist file 👌

@manuroe manuroe merged commit 3950cac into develop Jan 6, 2025
15 checks passed
@manuroe manuroe deleted the manuroe/agpl_and_element_v2 branch January 6, 2025 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-misc for other changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants