Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Ocelot-Social-Community/stage.ocelot.social
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: IT4Change/freilernen.social
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 1,842 additions and 836 deletions.
  1. +1 −0 .env
  2. +0 −23 .env.dist
  3. BIN .env.enc
  4. +0 −57 .github/workflows/deploy.yml
  5. +76 −256 .github/workflows/publish.yml
  6. +0 −4 .gitignore
  7. +13 −0 .sops.yaml
  8. +0 −21 LICENSE
  9. +11 −0 LICENSE.md
  10. +32 −0 TODO-next-update.md
  11. 0 branding/constants/{donation.ts → donation.js}
  12. +4 −4 branding/constants/{emails.ts → emails.js}
  13. 0 branding/constants/{filter.ts → filter.js}
  14. +1 −1 branding/constants/{groups.ts → groups.js}
  15. +13 −0 branding/constants/headerMenu.js
  16. +0 −13 branding/constants/headerMenu.ts
  17. +22 −23 branding/constants/{links.ts → links.js}
  18. +2 −2 branding/constants/{logos.ts → logos.js}
  19. +3 −3 branding/constants/{metadata.ts → metadata.js}
  20. +0 −2 branding/locales/de.json
  21. +0 −2 branding/locales/en.json
  22. +7 −12 branding/locales/html/de/code-of-conduct.html
  23. +1,218 −52 branding/locales/html/de/data-privacy.html
  24. +14 −6 branding/locales/html/de/donate.html
  25. +9 −19 branding/locales/html/de/faq.html
  26. +29 −9 branding/locales/html/de/imprint.html
  27. +20 −6 branding/locales/html/de/organization.html
  28. +2 −2 branding/locales/html/de/support.html
  29. +6 −12 branding/locales/html/de/terms-and-conditions.html
  30. +1 −1 branding/locales/html/en/code-of-conduct.html
  31. +1 −1 branding/locales/html/en/data-privacy.html
  32. +1 −1 branding/locales/html/en/donate.html
  33. +1 −1 branding/locales/html/en/faq.html
  34. +1 −1 branding/locales/html/en/imprint.html
  35. +1 −1 branding/locales/html/en/organization.html
  36. +1 −1 branding/locales/html/en/support.html
  37. +1 −1 branding/locales/html/en/terms-and-conditions.html
  38. +12 −0 branding/locales/tmp/de.json
  39. +12 −0 branding/locales/tmp/en.json
  40. BIN branding/static/favicon.ico
  41. BIN branding/static/icon.png
  42. +8 −78 branding/static/img/custom/logo-horizontal.svg
  43. +6 −78 branding/static/img/custom/logo-squared.svg
  44. +58 −0 docker-compose.yml
  45. +6 −0 docker/backend.Dockerfile
  46. +7 −0 docker/maintenance.Dockerfile
  47. +6 −0 docker/webapp.Dockerfile
  48. +7 −0 helmfile/environments/default.yaml.gotmpl
  49. +11 −0 helmfile/environments/production.yaml.gotmpl
  50. +29 −0 helmfile/helmfile.yaml.gotmpl
  51. +2 −0 helmfile/scripts/branded_image_tag.sh
  52. +6 −0 helmfile/scripts/ocelot_image_tag.sh
  53. +40 −0 helmfile/secrets/kubeconfig
  54. +95 −0 helmfile/secrets/ocelot.yaml
  55. +46 −0 helmfile/values/ocelot.yaml.gotmpl
  56. BIN kubeconfig.yaml.enc
  57. +0 −2 kubernetes/dns.values.yaml.enc
  58. +0 −12 kubernetes/dns.values.yaml.template
  59. BIN kubernetes/values.yaml.enc
  60. +0 −129 kubernetes/values.yaml.template
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OCELOT_VERSION=sha-80ff4ef
23 changes: 0 additions & 23 deletions .env.dist

This file was deleted.

Binary file removed .env.enc
Binary file not shown.
57 changes: 0 additions & 57 deletions .github/workflows/deploy.yml

This file was deleted.

Loading