From f60399feb4b6dfdba06ffd678fa17cc68053c06b Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 27 May 2024 17:44:46 +0200 Subject: [PATCH] vault backup: 2024-05-27 17:44:46 --- Firefox Handbuch.md => Firefox HowTo.md | 4 +- Firefox.md | 2 +- Git HowTo.md | 103 ++++++++++++++++++ Git.md | 2 + Infomaniak Handbuch.md => Infomaniak HowTo.md | 2 +- Infomaniak.md | 2 +- Jenkins Handbuch.md => Jenkins HowTo.md | 2 +- Jenkins.md | 2 +- ...Office Handbuch.md => LibreOffice HowTo.md | 4 +- LibreOffice.md | 2 +- Nextcloud Handbuch.md => Nextcloud HowTo.md | 2 +- Nextcloud.md | 2 +- Obsidian Handbuch.md => Obsidian HowTo.md | 2 +- Obsidian.md | 2 +- Problemanalyse Support.md | 2 +- Restic Handbuch.md => Restic HowTo.md | 2 +- ...Handbuch HAR.png => Firefox HowTo HAR.png} | Bin ... LibeOffice HowTo Duplikate entfernen.png} | Bin restic.md | 2 +- 19 files changed, 122 insertions(+), 17 deletions(-) rename Firefox Handbuch.md => Firefox HowTo.md (93%) create mode 100644 Git HowTo.md rename Infomaniak Handbuch.md => Infomaniak HowTo.md (91%) rename Jenkins Handbuch.md => Jenkins HowTo.md (99%) rename LibreOffice Handbuch.md => LibreOffice HowTo.md (65%) rename Nextcloud Handbuch.md => Nextcloud HowTo.md (99%) rename Obsidian Handbuch.md => Obsidian HowTo.md (96%) rename Restic Handbuch.md => Restic HowTo.md (96%) rename attachments/{Firefox Handbuch HAR.png => Firefox HowTo HAR.png} (100%) rename attachments/{LibeOffice Handbuch Duplikate entfernen.png => LibeOffice HowTo Duplikate entfernen.png} (100%) diff --git a/Firefox Handbuch.md b/Firefox HowTo.md similarity index 93% rename from Firefox Handbuch.md rename to Firefox HowTo.md index bba077c8..8126c5ff 100644 --- a/Firefox Handbuch.md +++ b/Firefox HowTo.md @@ -2,7 +2,7 @@ tags: - Definition --- -# Firefox Handbuch +# Firefox HowTo ## Netzwerkzugriff aufzeichnen @@ -15,7 +15,7 @@ Um den Netzwerkzugriff aufzuzeichnen gehen Sie wie folgt vor. * Arbeiten Sie ganz normal mit der Webanwendung * Nach einer bestimmten Zeit oder Eintreten eines Ereignisses, speichern sie die Aufzeichnung mit der Aktion *Alles als HAR speichern* -![[Firefox Handbuch HAR.png]] +![[Firefox HowTo HAR.png]] * Sie können Sie Entwickler-Konsole schliessen * Schicken Sie die .har Datei an den Systemadministrator der Webapplikation \ No newline at end of file diff --git a/Firefox.md b/Firefox.md index 1666e0ec..e4a51c56 100644 --- a/Firefox.md +++ b/Firefox.md @@ -8,7 +8,7 @@ Website: Weiterführende Links: -* [[Firefox Handbuch]] +* [[Firefox HowTo]] ## Erweiterung diff --git a/Git HowTo.md b/Git HowTo.md new file mode 100644 index 00000000..69a4debf --- /dev/null +++ b/Git HowTo.md @@ -0,0 +1,103 @@ +--- +tags: +- HowTo +--- +# Git HowTo + +## Fork aktualisieren + +In diesem Beispiel haben wir einen Fork: + +* Upstream: https://github.com/Mint-System/Odoo-Build/ +* Origin: https://github.com/sozialinfo/Odoo-Build + +Repo öffnen. + +``` +cd Sozialinfo-Odoo-Build +git switch 16.0 +``` + +Mit `git remote -v` im Repo die Remotes anzeigen. Wenn nötig den Upsream hinzufügen: + +``` +git remote add upstream git@github.com:Mint-System/Odoo-Build.git +``` + + Mit `git switch Mint-System-16.0` den Upstream-Branch wechseln. Wenn nötig erstellen: + +``` +git switch --oprhan Mint-System-16.0 +``` + +Von dort den Upstream-Branch pullen. + +``` +git pull upstream +``` + +Dann in den Main-Branch wechseln. + +``` +git switch 16.0 +``` + +Und den Upstream-Branch mergen. + +``` +git merge Mint-System-16.0 +``` + +Alle Konflikte beheben und unnötige Submodule entfernen. + +``` +task git-submodule-remove addons/manufacture +task git-submodule-remove addons/odoo_apps_thirdparty +task git-submodule-remove addons/product_attribute +task git-submodule-remove addons/social +task git-submodule-remove addons/stock_logistics_workflow +task git-submodule-remove oca/account-closing +task git-submodule-remove oca/account-financial-reporting +task git-submodule-remove oca/account-financial-tools +task git-submodule-remove oca/account-reconcile +task git-submodule-remove oca/bank-statement-import +task git-submodule-remove oca/brand +task git-submodule-remove oca/business-requirement +task git-submodule-remove oca/community-data-files +task git-submodule-remove oca/connector +task git-submodule-remove oca/contract +task git-submodule-remove oca/credit-control +task git-submodule-remove oca/crm +task git-submodule-remove oca/e-commerce +task git-submodule-remove oca/edi +task git-submodule-remove oca/helpdesk +task git-submodule-remove oca/hr +task git-submodule-remove oca/hr-attendance +task git-submodule-remove oca/hr-holidays +task git-submodule-remove oca/iot +task git-submodule-remove oca/knowledge +task git-submodule-remove oca/management-system +task git-submodule-remove oca/manufacture +task git-submodule-remove oca/product-attribute +task git-submodule-remove oca/project +task git-submodule-remove oca/queue +task git-submodule-remove oca/reporting-engine +task git-submodule-remove oca/rest-framework +task git-submodule-remove oca/sale-reporting +task git-submodule-remove oca/server-auth +task git-submodule-remove oca/server-ux +task git-submodule-remove oca/social +task git-submodule-remove oca/stock-logistics-warehouse +task git-submodule-remove oca/timesheet +task git-submodule-remove oca/website +task git-submodule-remove oca/dms +task git-submodule-remove oca/l10n-switzerland +task git-submodule-remove oca/maintenance +``` + +Referenzen der Submodule aktualisieren. + +``` +task checkout 16.0 +task git-submodule-pull +``` \ No newline at end of file diff --git a/Git.md b/Git.md index 2ad96d63..2b807f4b 100644 --- a/Git.md +++ b/Git.md @@ -8,6 +8,8 @@ Git ist eine freie Software zur verteilten Versionsverwaltung von Dateien, die d Website: +Weiterführende Links: [[Git HowTo]] + ## Client Ein einfach zu bedienender Client für GitHub ist [GitHub Desktop](https://desktop.github.com/). \ No newline at end of file diff --git a/Infomaniak Handbuch.md b/Infomaniak HowTo.md similarity index 91% rename from Infomaniak Handbuch.md rename to Infomaniak HowTo.md index 2712b9a6..3832c349 100644 --- a/Infomaniak Handbuch.md +++ b/Infomaniak HowTo.md @@ -2,7 +2,7 @@ tags: - Definition --- -# Infomaniak Handbuch +# Infomaniak HowTo ## Autoresponder einschalten diff --git a/Infomaniak.md b/Infomaniak.md index 6f908384..7fad57b2 100644 --- a/Infomaniak.md +++ b/Infomaniak.md @@ -8,7 +8,7 @@ Website: Die Mail-Postfächer der Mint-System werden von Infomaniak verwaltet. -[[Infomaniak Handbuch]]\ +[[Infomaniak HowTo]]\ [[Mail-Accounts]] ## Troubleshooting diff --git a/Jenkins Handbuch.md b/Jenkins HowTo.md similarity index 99% rename from Jenkins Handbuch.md rename to Jenkins HowTo.md index d82d84e1..4bb4a45b 100644 --- a/Jenkins Handbuch.md +++ b/Jenkins HowTo.md @@ -2,7 +2,7 @@ tags: - Definition --- -# Jenkins Handbuch +# Jenkins HowTo ## Jenkinks mit Docker Agent bereitstellen diff --git a/Jenkins.md b/Jenkins.md index f34cf132..5e823426 100644 --- a/Jenkins.md +++ b/Jenkins.md @@ -8,7 +8,7 @@ Website: Weiterführende Links: -* [[Jenkins Handbuch]] +* [[Jenkins HowTo]] * [[Jenkins Security]] * [[Jenkins Hosting]] ## Docker Umgebung diff --git a/LibreOffice Handbuch.md b/LibreOffice HowTo.md similarity index 65% rename from LibreOffice Handbuch.md rename to LibreOffice HowTo.md index d8cfd9c1..8e16badc 100644 --- a/LibreOffice Handbuch.md +++ b/LibreOffice HowTo.md @@ -2,10 +2,10 @@ tags: - Definition --- -# LibreOffice Handbuch +# LibreOffice HowTo ## Duplikate entfernen Standardfilter anlegen und unter *Options* die Option *No duplications* auswählen. -![[LibeOffice Handbuch Duplikate entfernen.png]] \ No newline at end of file +![[LibeOffice HowTo Duplikate entfernen.png]] \ No newline at end of file diff --git a/LibreOffice.md b/LibreOffice.md index 82fc7c17..e587373a 100644 --- a/LibreOffice.md +++ b/LibreOffice.md @@ -4,7 +4,7 @@ tags: --- # LibreOffice -[[LibreOffice Handbuch]] +[[LibreOffice HowTo]] Produkte: * [[LibreOffice Impress]] diff --git a/Nextcloud Handbuch.md b/Nextcloud HowTo.md similarity index 99% rename from Nextcloud Handbuch.md rename to Nextcloud HowTo.md index fe9de57c..1ee5194f 100644 --- a/Nextcloud Handbuch.md +++ b/Nextcloud HowTo.md @@ -2,7 +2,7 @@ tags: - HowTo --- -# Nextcloud Handbuch +# Nextcloud HowTo ![[Nextcloud Logo.png]] diff --git a/Nextcloud.md b/Nextcloud.md index 30a2f5d5..416c7c42 100644 --- a/Nextcloud.md +++ b/Nextcloud.md @@ -8,7 +8,7 @@ tags: Website: [[Nextcloud Troubleshooting]]\ -[[Nextcloud Handbuch]]\ +[[Nextcloud HowTo]]\ [[Nextcloud Painpoints]]\ [[Nextcloud Apps]]\ [[Nextcloud Enterprise]]\ diff --git a/Obsidian Handbuch.md b/Obsidian HowTo.md similarity index 96% rename from Obsidian Handbuch.md rename to Obsidian HowTo.md index b3df8df0..66e9c436 100644 --- a/Obsidian Handbuch.md +++ b/Obsidian HowTo.md @@ -2,7 +2,7 @@ tags: - Definition --- -# Obsidian Handbuch +# Obsidian HowTo ![[Obsidian Logo.png]] diff --git a/Obsidian.md b/Obsidian.md index 8bf92035..979dbf73 100644 --- a/Obsidian.md +++ b/Obsidian.md @@ -9,4 +9,4 @@ a local folder of plain text Markdown files. Website: -Dazu gibt es das [[Obsidian Handbuch]]. \ No newline at end of file +Dazu gibt es das [[Obsidian HowTo]]. \ No newline at end of file diff --git a/Problemanalyse Support.md b/Problemanalyse Support.md index a736ca8a..10836ce6 100644 --- a/Problemanalyse Support.md +++ b/Problemanalyse Support.md @@ -15,4 +15,4 @@ Solche Probleme sind sehr schwierig zum analysieren. Die Performance von einem S * Ist das Problem an einem bestimmten Zeitpunk in Erscheinung getreten? Tests: - * [[Firefox Handbuch]] \ No newline at end of file + * [[Firefox HowTo]] \ No newline at end of file diff --git a/Restic Handbuch.md b/Restic HowTo.md similarity index 96% rename from Restic Handbuch.md rename to Restic HowTo.md index 5a91dcf8..bceb2cc3 100644 --- a/Restic Handbuch.md +++ b/Restic HowTo.md @@ -2,7 +2,7 @@ tags: - HowTo --- -# Restic Handbuch +# Restic HowTo ## Repo auf Server öffnen diff --git a/attachments/Firefox Handbuch HAR.png b/attachments/Firefox HowTo HAR.png similarity index 100% rename from attachments/Firefox Handbuch HAR.png rename to attachments/Firefox HowTo HAR.png diff --git a/attachments/LibeOffice Handbuch Duplikate entfernen.png b/attachments/LibeOffice HowTo Duplikate entfernen.png similarity index 100% rename from attachments/LibeOffice Handbuch Duplikate entfernen.png rename to attachments/LibeOffice HowTo Duplikate entfernen.png diff --git a/restic.md b/restic.md index 4430ae39..798a9268 100644 --- a/restic.md +++ b/restic.md @@ -6,5 +6,5 @@ tags: Website: -[[Restic Handbuch]]\ +[[Restic HowTo]]\ [[Restic Troubleshooting]] \ No newline at end of file