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

8.0 staging merge #1486

Merged
merged 105 commits into from
Aug 15, 2023
Merged

8.0 staging merge #1486

merged 105 commits into from
Aug 15, 2023

Conversation

Scrumplex
Copy link
Member

No description provided.

Ryex and others added 30 commits June 4, 2023 14:10
@Ryex
chore: add better default compiler warnings
7e0e1ec 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
chore: clean up after new compiler warnings
cc41b03 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
chore: fix test & clean up one last warning
df18d85 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
packaging: add appimage update capability
53d40df 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(linux): use vars when refrencing qt install dir

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(appimage): dont use rsync

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging: use runner.workspace when copying files

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(appimage): put zsync in relase:x

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

use with:token insted of env for GITHUB_TOKEN (which is depricated)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix: appimage zsync needs consistant filenames across verisons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

upload proper zsync

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix: non versioned appimage filename

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
packaging: sign appimages with gpg
6685810 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher
f8a02a5 
 into packaging/appimage-updates
@TheKodeToad
Basic, unfinished & broken impl
6ccc7e7 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
License all the things
82d3755 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
Just use the old ordering
a389983 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
Rework icons (Fabric is blurry now but looks better)
94510ed 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
Fix
1f16380 
I could use rvalue references and fix my brain fart, but i think regular references are more readable and safer here.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
Make selectedPage const 🤦‍♀️
dea33a3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad
Merge branch 'PrismLauncher:develop' into better-component-installation
e7ad373
@TheKodeToad
Dynamic button text
05d2c1f 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@Ryex
echo to correct var for summary
0e7f435 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
refactor: split out setting api headers for downloads
9c10965 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
refactor: override / mask static make functions for ApiDownload
418677e 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
chore: format
6db906d 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
fix: class rename (lsp acitons undid the first rename :P)
3105f31 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
feat(net): ApiUpload ^& fix unfired finished signals
c8ff812 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
Merge remote-tracking branch 'upstream/develop' into refactor/net-spl…
df4fd7d 
…it-headers-to-proxy-class
@Ryex
fix: add ApiUpload to CMakeLists.txt
013a26a 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
fixup! Merge remote-tracking branch 'upstream/develop' into refactor/…
1ba08f4 
…net-split-headers-to-proxy-class
@Ryex
DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.g…
4ea0a56 
…ithub.com>

I, Rachel Powers <508861+Ryex@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 1ba08f4

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@getchoo
fix(net): fix emit signals in download & upload task
c49ee87 
Signed-off-by: seth <getchoo@tuta.io>
@Ryex
fix: ensure finished signal is emited
b142407 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Trial97
Simplify Upload and Download
385babb 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97
More clenup
45c39d0 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Ryex
Merge pull request #1 from Trial97/refactor/net-split-headers-to-prox…
6aa30d3 
…y-class

Simplify Upload and Download
@TheKodeToad
Merge branch 'develop' into better-component-installation
7138425 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 11, 2023
View reviewed changes
launcher/ui/dialogs/InstallLoaderDialog.h
class PackProfile;
class QDialogButtonBox;

class InstallLoaderDialog final : public QDialog, protected BasePageProvider {

Check notice

Code scanning / CodeQL

Undisciplined multiple inheritance Note

Multiple inheritance should not be used with 1 interfaces, 0 private implementations, 0 protected implementations, and 1 public implementations.
Scrumplex and others added 5 commits August 11, 2023 10:57
@Scrumplex
fix: fix more warnings
ea43d0f 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Trial97 @Scrumplex
revert asan on debug on by default
92dbe16 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97 @Scrumplex
Update CMakeLists.txt
bcf0635 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
@Scrumplex
Merge pull request #1517 from Trial97/revert_asan
44153a2
@Scrumplex
Merge remote-tracking branch 'upstream/staging' into chore/add-compil…
35358f8 
…er-warnings
TheKodeToad
TheKodeToad approved these changes Aug 12, 2023
View reviewed changes
Copy link
Member

@TheKodeToad TheKodeToad left a comment

Choose a reason for hiding this comment

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

(provided the actions pass, this is to allow merging)

@Trial97
Copy link
Member

Trial97 commented Aug 12, 2023

fixes #1495
Missed the chance to close it with this PR: #1230

@TheKodeToad
Merge pull request #1107 from Ryex/chore/add-compiler-warnings
a44cb64 
Introduce more strict compiler warnings and fix them
Trial97
Trial97 approved these changes Aug 13, 2023
View reviewed changes
Copy link
Member

@Trial97 Trial97 left a comment

Choose a reason for hiding this comment

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

needs at least two approvals right?

@TheKodeToad TheKodeToad linked an issue Aug 13, 2023 that may be closed by this pull request
Combine the install mod loader buttons #1495
Closed
1 task
@Scrumplex
Copy link
Member Author

I'll resolve the conflicts tomorrow

@TheKodeToad
Copy link
Member

You have seven minutes :trollface:

@Scrumplex
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
779f700
@Scrumplex
chore: reformat
91ba4cf 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex
chore: update license headers
215d7db 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex added this to the 8.0 milestone Aug 14, 2023
@Scrumplex
Copy link
Member Author

git commit history is so gonna be a mess :(

@Trial97
Copy link
Member

Trial97 commented Aug 14, 2023

Better a mess than a single gigantic commit with all these changes, right?

@Scrumplex
Copy link
Member Author

still conflicting. I need some time to focus on resolving

@Trial97
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher
0ba88ff 
 into staging

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97
Copy link
Member

Trial97 commented Aug 14, 2023

Is this enough for merge conflicts: https://github.com/PrismLauncher/PrismLauncher/compare/staging...Trial97:PrismLauncher:staging?expand=1 or do you have something more fancy?

@Trial97
Some warnings
9546c77 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Scrumplex Scrumplex marked this pull request as ready for review August 15, 2023 07:00
@Scrumplex
chore: reformat
1939e3e 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex merged commit 4b06255 into develop Aug 15, 2023
36 checks passed
@Scrumplex Scrumplex deleted the staging branch August 15, 2023 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Trial97 Trial97 Trial97 approved these changes

@TheKodeToad TheKodeToad TheKodeToad approved these changes

Assignees
No one assigned
Labels
changelog:omit A PR that doesn't appear in the changelog
Projects
None yet
Milestone
8.0
Development

Successfully merging this pull request may close these issues.

Combine the install mod loader buttons
6 participants
@Scrumplex @Trial97 @TheKodeToad @Ryex @getchoo @leia-uwu