Skip to content

Commit d5d1923

Browse files
committed
Merge remote-tracking branch 'origin/main' into staging
2 parents 7705e1e + cdff1ec commit d5d1923

File tree

9 files changed

+27
-22
lines changed

9 files changed

+27
-22
lines changed

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PATH
2323
GEM
2424
remote: https://rubygems.org/
2525
specs:
26-
activesupport (8.0.1)
26+
activesupport (8.0.2)
2727
base64
2828
benchmark (>= 0.3)
2929
bigdecimal
@@ -52,7 +52,7 @@ GEM
5252
csl (~> 1.6)
5353
colorator (1.1.0)
5454
concurrent-ruby (1.3.5)
55-
connection_pool (2.4.1)
55+
connection_pool (2.5.0)
5656
csl (1.6.0)
5757
namae (~> 1.0)
5858
rexml
@@ -132,22 +132,22 @@ GEM
132132
listen (3.9.0)
133133
rb-fsevent (~> 0.10, >= 0.10.3)
134134
rb-inotify (~> 0.9, >= 0.9.10)
135-
logger (1.6.3)
135+
logger (1.7.0)
136136
mercenary (0.4.0)
137137
mini_portile2 (2.8.8)
138-
minitest (5.25.4)
138+
minitest (5.25.5)
139139
namae (1.2.0)
140140
racc (~> 1.7)
141-
nokogiri (1.18.2)
141+
nokogiri (1.18.7)
142142
mini_portile2 (~> 2.8.2)
143143
racc (~> 1.4)
144-
nokogiri (1.18.2-x86_64-linux-gnu)
144+
nokogiri (1.18.7-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.9.1)
150+
rack (3.0.14)
151151
rake (13.2.1)
152152
rb-fsevent (0.11.2)
153153
rb-inotify (0.11.1)
@@ -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.2)
161+
ruby-vips (2.2.3)
162162
ffi (~> 1.12)
163163
logger
164164
safe_yaml (1.0.5)
@@ -180,7 +180,7 @@ GEM
180180
uglifier (4.2.1)
181181
execjs (>= 0.3.0, < 3)
182182
unicode-display_width (2.6.0)
183-
uri (1.0.2)
183+
uri (1.0.3)
184184
webrick (1.9.1)
185185

186186
PLATFORMS

_data/conferences_de.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
- date: "2024-05-14"
181181
event: "SCS Summit 2024"
182182
title: "openDesk auf SCS - ein digital souveräner Arbeitsplatz für die öffentliche Verwaltung"
183-
details: "Andreas Reckert-Lodde, Interims-Geschäftsführer ZenDiS"
183+
details: "Andreas Reckert-Lodde, Interims-Geschäftsführer ZenDiS & Felix Kronlage-Dammers"
184184
slides: "summit2024/summit2024_18_reckert_openDeskSCS_SCSSummit_20240508.pdf"
185185
link: "https://www.youtube.com/watch?v=NA3WB9fcggQ"
186186

_gems/jekyll-assets/Gemfile.lock

Lines changed: 2 additions & 2 deletions
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.10)
152+
rack (2.2.12)
153153
rack-test (2.1.0)
154154
rack (>= 1.3)
155155
rails-dom-testing (2.2.0)
@@ -170,7 +170,7 @@ GEM
170170
rb-inotify (0.10.1)
171171
ffi (~> 1.0)
172172
regexp_parser (2.6.2)
173-
rexml (3.4.0)
173+
rexml (3.4.1)
174174
rouge (3.30.0)
175175
rspec (3.12.0)
176176
rspec-core (~> 3.12.0)

_i18n/de/events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Bereits zum zweiten Mal fand unser SCS Summit am 14.05.2024 in Berlin statt. In der Villa Elisabeth in Berlin Mitte konnten wir erleben, was gemeinsam in der SCS Community bereits erreicht wurde, wie die Pläne für die Zukunft aussehen und vor allem, dass es immer mehr werden, die dabei sind, Digitale Souveränität zu verwirklichen.
88
Schauen Sie hier gern zurück auf die beiden vergangenen Jahre und die spannenden Vorträge und Diskussionen und seien Sie im kommenden Jahr mit dabei, wenn der SCS Summit in die dritte Runde geht -
99

10-
Save the Date: 08. Mai 2025
10+
Save the Date: 24. September 2025
1111

1212
[Rückblick 2024](/summit2024)
1313

_i18n/de/use.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Am 20.9.2023 haben wir [Release 5](https://github.com/SovereignCloudStack/releas
4242

4343
Am 20.3.2024 haben wir [Release 6](https://github.com/SovereignCloudStack/release-notes/blob/main/Release6.md) freigegeben.
4444

45+
Am 11.9.2024 haben wir [Release 7](https://github.com/SovereignCloudStack/release-notes/blob/main/Release7.md) freigegeben.
46+
4547
## SCS und OSISM
4648

4749
Für die grundlegenden Schichten bauen wir auf dem

_i18n/en/events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Our SCS Summit took place for the second time on May 14, 2024 in Berlin. In the Villa Elisabeth in Berlin Mitte, we were able to experience what has already been achieved together in the SCS community, what the plans for the future look like and, above all, that there are more and more people who are in the process of realizing digital sovereignty.
88
Take a look back at the past two years and the exciting presentations and discussions and join us next year when the SCS Summit enters its third round -
99

10-
Save the Date: May 8, 2025
10+
Save the Date: September 24th, 2025
1111

1212
[Review 2024](/summit2024)
1313

_i18n/en/use.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ On Sep 20, 2023 we have published [Release 5](https://github.com/SovereignCloudS
3737

3838
On Mar 20, 2024 we have published [Release 6](https://github.com/SovereignCloudStack/release-notes/blob/main/Release6.md).
3939

40+
On Sep 11, 2024 we have published [Release 7](https://github.com/SovereignCloudStack/release-notes/blob/main/Release7.md).
41+
4042
## SCS and OSISM
4143

4244
For the base layers, we heavily build on top of the

package-lock.json

Lines changed: 8 additions & 7 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.3",
6+
"bootstrap": "^5.3.5",
77
"fork-awesome": "^1.2.0",
88
"fullcalendar": "^5.11.4",
99
"jquery": "^3.7.1",

0 commit comments

Comments
 (0)