aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/pages
AgeCommit message (Collapse)Author
2023-07-31Merge branch 'develop' into refactor/net-split-headers-to-proxy-classRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-25Delete some incorrect `notr="true"` tagstjw123hh
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
2023-07-24Delete some incorrect tagstjw123hh
2023-07-17Merge pull request #1286 from TayouVR/better-instance-group-separatorTayou
2023-07-17Merge pull request #1357 from getchoo/quilt-beaconSefa Eyeoglu
feat: add toggle for quilt beacon
2023-07-16Merge pull request #1276 from Scrumplex/print-build-platformseth
Print build platform on launch
2023-07-15auto focus search line on resource downloadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-15chore: better explain quilt loader beaconseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-12feat: add toggle for quilt beaconseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-12fixed crash if no version is loadedTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-10Merge pull request #1249 from Trial97/curseTheKodeToad
Curseforge modpack export
2023-07-10Merge pull request #1338 from Trial97/unlockVersionPageTheKodeToad
feat:unlocked versions page
2023-07-09Merge pull request #1241 from Trial97/settingsTheKodeToad
Allow editing of running instances
2023-07-09removed redundant codeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-09feat:unlocked versions pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-08Fix actionVisitItemPage insersion, and prevent widebar segfaultTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into settings Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-07Merge pull request #1120 from Trial97/visit_mod_pageTayou
2023-07-07fix: improve QUrl constructionSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-07Update ModFolderPage.cppTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-07Made action text simplerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-07fix(ui): validate meta override urlSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-04Merge branch 'develop' into fix-implicit-fallthroughPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-04Remove break and add fallthrough comment in WorldListPage.cppPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-03updated option textTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-02Merge pull request #1232 from telans/screenshots-updateTheKodeToad
ScreenshotsPage fixes
2023-07-02Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-284 clang-tidy changes, update copyright infoTayou
while already at it I updated all my emails to use one from my domain Signed-off-by: Tayou <tayou@gmx.net>
2023-06-28Added warnings for running instancesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-28Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into settings
2023-06-28Merge pull request #1266 from TheKodeToad/smol-tweaksSefa Eyeoglu
2023-06-27Added more information to the screenshot upload warningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-26chore: remove obsolete macOS warningSefa Eyeoglu
We don't support that macOS version. This check also never worked, as we never set the platform to that value. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-25Merge remote-tracking branch 'upstream/develop' into ↵Rachel Powers
refactor/net-split-headers-to-proxy-class
2023-06-25fix: Page container extra info set on logs pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-25refactor: split out setting api headers for downloadsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-25Fix big mistake :iea:TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Replace accidental usages of QAbstractButton::pressedTheKodeToad
This signal is not usually what you want, and creates an inconsistent experience. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Made custom url functionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-25Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into visit_mod_page
2023-06-24Fix Open Global Settings, why notTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24A few tweaks, with inspiration from Zeke :3TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse
2023-06-24Made sure CurseForge string is corectTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into net_job_crash
2023-06-22Merge pull request #1252 from getchoo/import-heheseth
chore: avoid confusion in file/url import dialog
2023-06-22Merge pull request #1058 from Ryex/feature/images-for-resource-pageRachel Powers
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
2023-06-22chore: avoid confusion in file/url import dialogseth
Signed-off-by: seth <getchoo@tuta.io>
2023-06-21Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settingsTrial97