Skip to content

Commit 5e7815d

Browse files
committed
Merge remote-tracking branch 'origin/main' into staging
Signed-off-by: Kurt Garloff <[email protected]>
2 parents e4d9c36 + b54d492 commit 5e7815d

File tree

8 files changed

+38
-32
lines changed

8 files changed

+38
-32
lines changed

Gemfile.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ GEM
6868
extras (0.3.0)
6969
forwardable-extended (~> 2.5)
7070
fastimage (2.4.0)
71-
ffi (1.17.1)
72-
ffi (1.17.1-x86_64-linux-gnu)
71+
ffi (1.17.2)
72+
ffi (1.17.2-x86_64-linux-gnu)
7373
forwardable-extended (2.6.0)
7474
google-protobuf (3.25.5)
7575
bigdecimal
@@ -134,21 +134,21 @@ GEM
134134
rb-inotify (~> 0.9, >= 0.9.10)
135135
logger (1.7.0)
136136
mercenary (0.4.0)
137-
mini_portile2 (2.8.8)
137+
mini_portile2 (2.8.9)
138138
minitest (5.25.5)
139139
namae (1.2.0)
140140
racc (~> 1.7)
141-
nokogiri (1.18.7)
141+
nokogiri (1.18.9)
142142
mini_portile2 (~> 2.8.2)
143143
racc (~> 1.4)
144-
nokogiri (1.18.7-x86_64-linux-gnu)
144+
nokogiri (1.18.9-x86_64-linux-gnu)
145145
racc (~> 1.4)
146146
pathutil (0.16.2)
147147
forwardable-extended (~> 2.6)
148148
public_suffix (6.0.1)
149149
racc (1.8.1)
150-
rack (3.0.14)
151-
rake (13.2.1)
150+
rack (3.1.16)
151+
rake (13.3.0)
152152
rb-fsevent (0.11.2)
153153
rb-inotify (0.11.1)
154154
ffi (~> 1.0)
@@ -158,7 +158,7 @@ GEM
158158
chunky_png (~> 1.0)
159159
rqrcode_core (~> 1.0)
160160
rqrcode_core (1.2.0)
161-
ruby-vips (2.2.3)
161+
ruby-vips (2.2.4)
162162
ffi (~> 1.12)
163163
logger
164164
safe_yaml (1.0.5)
@@ -170,8 +170,9 @@ GEM
170170
sassc (2.4.0)
171171
ffi (~> 1.9)
172172
securerandom (0.4.1)
173-
sprockets (4.2.1)
173+
sprockets (4.2.2)
174174
concurrent-ruby (~> 1.0)
175+
logger
175176
rack (>= 2.2.4, < 4)
176177
terminal-table (3.0.2)
177178
unicode-display_width (>= 1.1.1, < 3)

_gems/jekyll-assets/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ GEM
149149
method_source (~> 1.0)
150150
public_suffix (5.0.1)
151151
racc (1.8.1)
152-
rack (2.2.12)
152+
rack (2.2.14)
153153
rack-test (2.1.0)
154154
rack (>= 1.3)
155155
rails-dom-testing (2.2.0)

_i18n/de.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ nav:
2222
contribute: "Zu SCS beitragen"
2323
summit: "Unser SCS Summit findet am 14. Mai 2024 in Berlin statt."
2424
summitPage: "/de/summit2024/"
25-
newpage: "Link zur neuen Webseite"
25+
newpage: "Entdecke unsere neue Webseite"
2626
footer:
2727
trademark: "Sovereign Cloud Stack, SCS und das Logo sind geschützte Marken der Open Source Business Alliance e.V. — Sonstige Marken sind Eigentum ihrer jeweiligen Besitzer."
2828
imprint: "Impressum"

_i18n/de/_posts/announcements/2025-04-11-final-report.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ Einerseits werden die SCS-Standards weiterentwickelt, weiter mit automatisierten
4242
Tests versehen, Zertifizierungen durchgeführt und die Verbreitung der Standards
4343
vorangetrieben. Die erfolgt in einer Gruppe innerhalb der
4444
[OSBA](https://osb-alliance.de/), dem
45-
*Forum SCS-Standards*. Zu diesem Zweck hat die OSBA Stellen für Mitarbeiter:innen
46-
geschaffen, so dass hier auch Handlungsfähigkeit besteht. Zur Finanzierung zahlen
47-
14 Gründungsunternehmen (mittlerweile 17) einen erhöhten Mitgliedsbeitrag.
45+
*Forum SCS-Standards*. Es wurde von 14 Unternehmen gegründet, inzwischen sind es 17,
46+
die die Standardisierung gemeinsam finanzieren. Weitere Unternehmen und Organisationen,
47+
privat oder öffentlich, sind willkommen.
48+
Die OSBA hat hierfür Stellen für Mitarbeiter:innen geschaffen, so dass hier
49+
auch Handlungsfähigkeit besteht.
4850
Die Steuerung der Standardisierung ist bewusst in einer Non-Profit Organisation
4951
angesiedelt, um hier die Neutralität zu gewährleisten. Dies erfolgt auch weiterhin
5052
in enger Zusammenarbeit mit [ALASCA e.V](https://alasca.cloud/).

_i18n/en.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ nav:
2222
contribute: "Contribute to SCS"
2323
summit: "Join us for our SCS Summit on 14th of May 2024 in Berlin."
2424
summitPage: "/summit2024/"
25-
newpage: "Link to new web page"
25+
newpage: "Discover our new web page"
2626
footer:
2727
trademark: "Sovereign Cloud Stack, SCS and the logo are registered trademarks of the Open Source Business Alliance e.V. — Other trademarks are property of their respective owners."
2828
imprint: "Imprint"

_i18n/en/_posts/announcements/2025-04-11-final-report.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ The first pillar is the evolution of the SCS standards, the development of
4343
compliance tests, certifications and the dissemination and adoption of the
4444
standards. This is driven by a group inside the
4545
[OSBA](https://osb-alliance.de), the *Forum SCS-Standards*.
46-
For this, the OSBA has created positions for employees to ensure there is meaningful
47-
progress. To fund it, 14 founding companies (meanwhile 17) are paying an extra
48-
membership fee. The standardization governance has been placed inside a
46+
It was founded by 14 companies, meanwhile 17, who together are providing the
47+
financial support for the joint standardization work. Further companies and
48+
organizations (private or public) are welcome to join.
49+
The OSBA has created positions for employees to ensure there is meaningful
50+
progress. The standardization governance has been placed inside a
4951
non-profit organization on purpose, ensuring neutrality. This continues to
5052
happen in close collaboration with [ALASCA e.V](https://alasca.cloud/).
5153
More information is available in a [press release on the Forum SCS-Standards](https://www.sovereigncloudstack.org/announcements/osba-forum-scs-standards/).

package-lock.json

Lines changed: 14 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"@fullcalendar/common": "^5.11.4",
44
"@fullcalendar/icalendar": "^5.11.5",
55
"apexcharts": "^3.54.1",
6-
"bootstrap": "^5.3.5",
6+
"bootstrap": "^5.3.7",
77
"fork-awesome": "^1.2.0",
88
"fullcalendar": "^5.11.4",
99
"jquery": "^3.7.1",

0 commit comments

Comments
 (0)