Skip to content

Commit

Permalink
Merge branch 'main' into renovate/linting
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Nov 2, 2023
2 parents 0157735 + 8ec18fb commit 1f2fddc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion resources/documentation/Dependencys.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ Setting NodeJS up is a bit more complicated than setting up python/rust, but it

- On linux, you can get it through your favorite package manager.
You normally should need to install `nodejs` and `pnpm`.
- On WSL, use [this guide](https://learn.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl) and [this guide](https://pnpm.io/installation)
- On WSL, use [this guide](https://learn.microsoft.com/en-us/windows/dev-environment/javascript/nodejs-on-wsl) and [this guide](https://pnpm.io/installation)
24 changes: 12 additions & 12 deletions webclient/src/components/feedback/TokenBasedModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,20 @@ function sendForm() {
<i class="form-icon" />
<b>
<span>
{{ t("public.agreement.pre") }}
{{ t("public.agreement.pre") }}
<a href="https://github.com/TUM-Dev/navigatum/issues" target="_blank">
{{ t("public.github_project_issues") }}
</a>
{{ t("public.agreement.post") }}
{{ t("public.agreement.post") }}
</span>
</b>
<br />
<span>
{{ t("public.disclaimer.pre") }}
<a href="https://docs.github.com/en/github/site-policy" target="_blank">
{{ t("public.github_site_policy") }}
</a>
{{ t("public.disclaimer.post") }}
{{ t("public.disclaimer.pre") }}
<a href="https://docs.github.com/en/github/site-policy" target="_blank">
{{ t("public.github_site_policy") }}
</a>
{{ t("public.disclaimer.post") }}
</span>
<span>
{{ t("public.processing_based_on_gdpr") }}
Expand All @@ -141,11 +141,11 @@ function sendForm() {
{{ t("public.right_of_appeal") }}
</span>
<span>
{{ t("public.objection_instruction.pre") }}
<RouterLink to="/about/impressum">
{{ t("public.imprint") }}
</RouterLink>
{{ t("public.objection_instruction.post") }}
{{ t("public.objection_instruction.pre") }}
<RouterLink to="/about/impressum">
{{ t("public.imprint") }}
</RouterLink>
{{ t("public.objection_instruction.post") }}
</span>
<span>
{{ t("public.question_contact") }}
Expand Down
2 changes: 1 addition & 1 deletion webclient/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if (import.meta.env.PROD) {
],
replaysSessionSampleRate: 0,
replaysOnErrorSampleRate: 1.0,
tracesSampleRate: 1.0,// 1.0 => capturing 100% of transactions
tracesSampleRate: 1.0, // 1.0 => capturing 100% of transactions
tracePropagationTargets: ["nav.tum.de"],
});
}
Expand Down

0 comments on commit 1f2fddc

Please sign in to comment.