diff --git a/.github/pull_request_template.md b/.forgejo/pull_request_template.md similarity index 100% rename from .github/pull_request_template.md rename to .forgejo/pull_request_template.md diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 8c5368128..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,65 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ master ] - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://git.io/codeql-language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # âšī¸ Command-line programs to run using the OS shell. - # đ https://git.io/JvXDl - - # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index 5ed16d9cd..5e919cf50 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -435,6 +435,16 @@ "https://commons.wikimedia.org/wiki/File:Media-floppy.svg" ] }, + { + "path": "forgejo.svg", + "license": "CC-BY-SA 4.0", + "authors": [ + "https://caesarschinas.com/" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Forgejo_logo.svg" + ] + }, { "path": "gear.svg", "license": "TRIVIAL", diff --git a/scripts/generateDocs.ts b/scripts/generateDocs.ts index 094b494c9..0e25bd506 100644 --- a/scripts/generateDocs.ts +++ b/scripts/generateDocs.ts @@ -245,7 +245,7 @@ export class GenerateDocs extends Script { const generatedFrom = [ "This document is autogenerated from", autogenSource - .map((s) => `[${s}](https://github.com/pietervdvn/MapComplete/blob/develop/${s})`) + .map((s) => `[${s}](https://source.mapcomplete.org/MapComplete/MapComplete/src/branch/develop/${s})`) .join(", "), ].join(" ") diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte index ba8c7079d..27be77ba7 100644 --- a/src/UI/BigComponents/MenuDrawer.svelte +++ b/src/UI/BigComponents/MenuDrawer.svelte @@ -52,6 +52,7 @@ import PanoramaxLink from "./PanoramaxLink.svelte" import { UIEventSource } from "../../Logic/UIEventSource" import MagnifyingGlassCircle from "@babeard/svelte-heroicons/mini/MagnifyingGlassCircle" + import Forgejo from "../../assets/svg/Forgejo.svelte" export let state: ThemeViewState let userdetails = state.osmConnection.userDetails @@ -206,7 +207,7 @@ {#if theme.official} <a class="flex" - href={"https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Themes/" + + href={"https://source.mapcomplete.org/MapComplete/MapComplete/src/branch/develop/Docs/Themes" + theme.id + ".md"} target="_blank" @@ -281,12 +282,12 @@ <Tr t={Translations.t.inspector.menu} /> </a> - <a class="flex" href="https://github.com/pietervdvn/MapComplete/" target="_blank"> - <Github class="h-6 w-6" /> + <a class="flex" href="https://source.mapcomplete.org/MapComplete/MapComplete/" target="_blank"> + <Forgejo class="h-6 w-6" /> <Tr t={Translations.t.general.attribution.gotoSourceCode} /> </a> - <a class="flex" href="https://github.com/pietervdvn/MapComplete/issues" target="_blank"> + <a class="flex" href="https://source.mapcomplete.org/MapComplete/MapComplete/issues" target="_blank"> <Bug class="h-6 w-6" /> <Tr t={Translations.t.general.attribution.openIssueTracker} /> </a>