Bommels05/Modrinth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/daedalus-add' into daedalus-add

Browse Source
This commit is contained in:
Jai A 2024-10-21 13:22:30 -07:00
commit 4a2ec0c40c
No known key found for this signature in database
GPG Key ID: 9A9F9B7250E9883C
7 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/src/main.rs
View File

@ -317,7 +317,7 @@ fn main() {
MessageDialog::new()
.set_type(MessageType::Error)
.set_title("Initialization error")
.set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://docs.modrinth.com/faq/app/webview2")
.set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://support.modrinth.com/en/articles/8797765-corrupted-microsoft-edge-webview2-installation")
.show_alert()
.unwrap();

8
apps/frontend/src/components/ui/AdPlaceholder.vue
View File

@ -52,6 +52,14 @@ useHead({
onMounted(() => {
window.tude = window.tude || { cmd: [] };
window.Raven = window.Raven || { cmd: [] };
window.Raven.cmd.push(({ config }) => {
config.setCustom({
param1: "web",
});
});
tude.cmd.push(function () {
tude.refreshAdsViaDivMappings([
{

8
apps/frontend/src/public/promo-frame.html
View File

@ -61,6 +61,14 @@
function initAds(personalized) {
window.tude = window.tude || { cmd: [] };
window.Raven = window.Raven || { cmd: [] };
window.Raven.cmd.push(({ config }) => {
config.setCustom({
param1: "app",
});
});
tude.cmd.push(function () {
tude.refreshAdsViaDivMappings([
{

2
apps/labrinth/README.md
View File

@ -2,4 +2,4 @@
## Modrinth's laboratory for its backend service & API!
For contributing information, please see the labrinth section of the [Modrinth contributing guide](https://docs.modrinth.com/docs/details/contributing/#labrinth-backend-and-api). For documentation on the API itself, see the [API Spec](https://docs.modrinth.com/api-spec/).
For contributing information, please see the labrinth section of the [Modrinth contributing guide](https://docs.modrinth.com/contributing/labrinth/). For documentation on the API itself, see the [API Spec](https://docs.modrinth.com/api/).

2
apps/labrinth/src/queue/moderation.rs
View File

@ -145,7 +145,7 @@ impl ModerationMessage {
ModerationMessage::NoPrimaryFile => "Please attach a file to this version. All files on Modrinth must have files associated with their versions.\n".to_string(),
ModerationMessage::PackFilesNotAllowed { files, .. } => {
let mut str = "".to_string();
str.push_str("This pack redistributes copyrighted material. Please refer to [Modrinth's guide on obtaining modpack permissions](https://docs.modrinth.com/modpacks/permissions) for more information.\n\n");
str.push_str("This pack redistributes copyrighted material. Please refer to [Modrinth's guide on obtaining modpack permissions](https://support.modrinth.com/en/articles/8797527-obtaining-modpack-permissions) for more information.\n\n");
let mut attribute_mods = Vec::new();
let mut no_mods = Vec::new();

2
apps/labrinth/src/routes/mod.rs
View File

@ -69,7 +69,7 @@ pub fn root_config(cfg: &mut web::ServiceConfig) {
Ok(req.into_response(
HttpResponse::Gone()
.content_type("application/json")
.body(r#"{"error":"api_deprecated","description":"You are using an application that uses an outdated version of Modrinth's API. Please either update it or switch to another application. For developers: https://docs.modrinth.com/docs/migrations/v1-to-v2/"}"#)
.body(r#"{"error":"api_deprecated","description":"You are using an application that uses an outdated version of Modrinth's API. Please either update it or switch to another application. For developers: https://docs.modrinth.com/api/#versioning"}"#)
))
}.boxed_local()
})

2
packages/ui/src/components/base/MarkdownEditor.vue
View File

@ -237,7 +237,7 @@
>This editor supports
<a
class="markdown-resource-link"
href="https://docs.modrinth.com/markdown"
href="https://support.modrinth.com/en/articles/8801962-advanced-markdown-formatting"
target="_blank"
>Markdown formatting</a
>.</span