Implementierung Fachbereichsseiten #305

Merged
Denys Konovalov merged 95 commits from feat/fachbereiche into main 2024-11-22 09:01:21 +01:00

95 Commits

Author SHA1 Message Date
1359cc21bf Letzte Materialien FB Geografie, Biologie
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 28s
2024-11-21 19:41:30 +01:00
7cd2aef7fc
Zusätzliche Verbesserungen
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 32s
Website Dev / Entwicklungsumgebung (push) Successful in 14s
- WoU-Kurs LdE
- Aktuelles-Einbindung für WoU-Kurse
- Ergänzungen JIA
- Fachbereichs-Verantwortliche GWF und MINT
- Enrfernung Titelbilder
2024-11-19 21:32:12 +01:00
597a2a7ac6
Merge branch 'dev' of ssh://git.cantorgymnasium.de/gcg/gcg-website into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 14s
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 33s
2024-11-17 22:22:36 +01:00
77d22fa3e2
Fix CMS config 2024-11-17 22:22:23 +01:00
fe87f434e2 Fachkurse/WoU (#304)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
- Übergangslösung aus Moodle-Texten
- LdE noch zu ergänzen

Reviewed-on: #304
2024-11-17 22:13:00 +01:00
c27bc1b836 Final fixes to ready subjects (#303)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
Reviewed-on: #303
2024-11-17 22:10:25 +01:00
9f8ad678e8
Final fixes to ready subjects
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 36s
2024-11-17 21:40:30 +01:00
f9aa6ae700
Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
2024-11-17 20:34:16 +01:00
fa820c9719 FB Astronomie (#301)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
Reviewed-on: #301
2024-11-09 16:26:47 +01:00
d1eca6cb09 Merge branch 'dev' of ssh://git.cantorgymnasium.de/gcg/gcg-website into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 18s
2024-11-09 13:19:36 +01:00
35de19d9f7 Merge branch 'main' into dev 2024-11-09 13:19:17 +01:00
8c3a4934d9 Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
2024-10-31 21:31:00 +01:00
93b9dac5c3 FB Sozialkunde (#299)
Some checks failed
Website Dev / Entwicklungsumgebung (push) Failing after 2s
- [ ] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [ ] Fotos
- [ ] Titelbild

Reviewed-on: #299
2024-10-31 21:29:09 +01:00
50abb2b631 Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
2024-10-31 19:54:28 +01:00
5bcd018c65 Diverse Ergänzungen
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
2024-10-10 20:10:14 +02:00
eab16b071b
Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 1m21s
2024-10-03 11:09:11 +02:00
137f07eb7c
Merge branch 'feat/fachbereiche' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 25s
2024-10-02 22:10:19 +02:00
0ab1e277af
various fixes 2024-10-02 22:09:38 +02:00
ccf390a23c FB Mathematik (#297)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 17s
- [ ] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [x] Fotos
- [x] Verlinkung WoU
- [x] Spezilager
- [ ] Titelbild

Reviewed-on: #297
2024-10-02 21:56:41 +02:00
843882bd3c
Merge branch 'feat/fachbereiche' of ssh://git.cantorgymnasium.de/gcg/gcg-website into feat/fachbereiche
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 26s
2024-10-02 21:55:54 +02:00
5e8d144107
WoU-Bereich 2024-10-02 21:55:39 +02:00
cbf4472137 Merge branch 'dev' into feat/fachbereiche
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 27s
2024-10-02 21:55:04 +02:00
90d0592b44
FB Mathematik
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 46s
2024-10-02 21:52:50 +02:00
f676bac628 Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
2024-09-19 20:37:26 +02:00
110afcd74d Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
2024-09-17 10:16:38 +02:00
5f246fd04a Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
2024-09-16 21:47:03 +02:00
e5af4599a1 Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 11s
2024-09-15 17:29:48 +02:00
2385b51b04 JIA-Kachel Info (#290)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
Reviewed-on: #290
2024-09-15 17:23:25 +02:00
cbf2c3cdcc FB Informatik (#289)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
- [x] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [ ] Fotos
- [ ] JIA-Einbettung
- [ ] Schulcurriculum
- [ ] Titelbild

Reviewed-on: #289
2024-09-15 16:59:09 +02:00
1c642e57fd FB Ethik/Religion (#288)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 10s
- [x] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [x] Fotos → noch zu ergänzen
- [ ] Titelbild

Reviewed-on: #288
2024-09-15 16:36:09 +02:00
410121ae38 FB Geschichte (#287)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
- [x] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [x] Fotos → noch zu ergänzen
- [ ] Titelbild

Reviewed-on: #287
2024-09-15 16:10:06 +02:00
a50eabd196 FB Kunst (#286)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s
- [x] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [x] Fotos
- [ ] Titelbild

Reviewed-on: #286
2024-09-13 11:01:17 +02:00
dd347459ab FB Deutsch (#285)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 11s
- [x] Einführung
- [x] Fachliche Schwerpunkte
- [x] Außerunterrichtliche Aktivitäten
- [x] Fotos
- [ ] Titelbild

Reviewed-on: #285
2024-09-12 10:13:49 +02:00
ffbf27544e Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 14s
2024-09-12 10:09:32 +02:00
f98d78f4ec Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 18s
2024-09-01 19:19:15 +02:00
24812834fd Merge branch 'feat/fachbereiche' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 10s
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 22s
2024-07-07 20:15:07 +02:00
c0ec8165fd Merge feat/fachbereiche into dev (#276)
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 27s
- Sport
- Fachadressen

Reviewed-on: #276
2024-07-07 20:13:28 +02:00
fb4cb4bc7c
Sport
All checks were successful
Website Pull Request / Pull-Request-Testbuild (pull_request) Successful in 26s
2024-07-07 20:06:12 +02:00
d9a98ba501
FBS refactor 2024-07-07 20:01:58 +02:00
aa9e6e92ca Sync dev with main
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 14s
2024-07-07 17:46:26 +02:00
2a367e7db8 Musik (#274)
Some checks failed
Website Dev / Entwicklungsumgebung (push) Failing after 1s
Reviewed-on: #274
2024-07-07 17:30:45 +02:00
05325f2737
Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 11s
2024-07-07 17:10:59 +02:00
ad4664838f static/admin/config/index.js aktualisiert
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
2024-07-07 17:10:28 +02:00
56e6b6728b Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 15s
2024-07-07 12:21:16 +02:00
637fad3af2 Sync dev with master
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 11s
2024-07-07 11:27:32 +02:00
2a809dcede Sync dev with master
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 12s
2024-07-07 11:21:30 +02:00
dba58d9a83 Sync dev with master
All checks were successful
Website Dev / dev-build (push) Successful in 19s
2024-07-05 21:55:28 +02:00
9b2e724c63 revert e4691c3ebbbf0a4789a0005d4aa5428c5d636f51
All checks were successful
website-dev / dev-build (push) Successful in 29s
revert revert acbc8897651b4b9c002537955896a79d337ec419

revert static/admin/config/index.js aktualisiert
2024-06-21 21:14:23 +02:00
e4691c3ebb revert acbc8897651b4b9c002537955896a79d337ec419
All checks were successful
website-dev / dev-build (push) Successful in 14s
revert static/admin/config/index.js aktualisiert
2024-05-18 15:08:52 +02:00
acbc889765 static/admin/config/index.js aktualisiert
All checks were successful
website-dev / dev-build (push) Successful in 29s
2024-05-18 14:52:01 +02:00
dc62e88e07 Sync dev with master
All checks were successful
website-dev / dev-build (push) Successful in 36s
2024-03-03 15:52:22 +01:00
20e020d059 Sync dev with master
All checks were successful
website-dev / dev-build (push) Successful in 38s
2024-03-02 23:07:22 +01:00
84e42372ff Sync dev with master
All checks were successful
website-dev / dev-build (push) Successful in 23s
2024-01-26 09:23:22 +01:00
444986afc7
fix icons
All checks were successful
website-dev / dev-build (push) Successful in 11s
2024-01-21 14:36:47 +01:00
8510dee494 Sync dev with master
All checks were successful
website-dev / dev-build (push) Successful in 1m15s
2024-01-21 14:19:59 +01:00
a6b3894077
Merge branch 'postalion-forms' into dev
All checks were successful
website-dev / dev-build (push) Successful in 28s
2024-01-05 21:07:49 +01:00
2c525cddb9
switch from formtools to postalion forms 2024-01-05 21:07:05 +01:00
b7313d630d
physik
All checks were successful
website-dev / dev-build (push) Successful in 11s
2024-01-03 14:54:26 +01:00
a068fdb753
Merge branch 'dev' into feat/fachbereiche 2024-01-03 14:38:02 +01:00
ee344a6f68
Merge branch 'dev' of ssh://git.cantorgymnasium.de/gcg/gcg-website into dev
All checks were successful
website-dev / dev-build (push) Successful in 14s
2024-01-03 14:37:39 +01:00
0986a9648b
Merge branch 'master' into dev 2024-01-03 14:37:16 +01:00
2c118ecfbe
WIP 2024-01-03 11:24:45 +01:00
c1c0307900
Merge branch 'dev' into feat/fachbereiche 2024-01-03 11:15:25 +01:00
c7959f524a Sync dev with master
All checks were successful
website-dev / dev-build (push) Successful in 23s
2024-01-02 22:08:52 +01:00
2b14b33b17 .gitea/workflows/prod.yaml aktualisiert
All checks were successful
website-dev / dev-build (push) Successful in 22s
2023-12-30 22:03:52 +01:00
18dbc9cebf
Merge branch 'master' into dev
All checks were successful
website-dev / dev-build (push) Successful in 49s
2023-12-24 14:25:51 +01:00
66f83d6436 .gitea/workflows/dev.yaml aktualisiert
All checks were successful
website-dev / dev-build (push) Successful in 22s
2023-12-20 18:30:15 +01:00
39aa5297f6 revert 2a0087e9835a9cb996b5d77477f0d37e81ca96b7
Some checks failed
website-dev / dev-build (push) Failing after 1s
revert .gitea/workflows/dev.yaml aktualisiert
2023-12-20 18:26:23 +01:00
2a0087e983 .gitea/workflows/dev.yaml aktualisiert
Some checks failed
website-dev / dev-build (push) Failing after 1s
2023-12-20 18:25:13 +01:00
ce221233a1 .gitea/workflows/dev.yaml aktualisiert
Some checks failed
website-dev / dev-build (push) Failing after 0s
2023-12-20 18:20:45 +01:00
d45df5bdfa .gitea/workflows/dev.yaml aktualisiert
Some checks failed
website-dev / dev-build (push) Failing after 1s
2023-12-20 18:12:01 +01:00
50a919894f Spanisch (#249)
All checks were successful
website-dev / dev-build (push) Successful in 25s
Reviewed-on: #249
2023-11-15 21:18:21 +01:00
2ab4361638
Merge branch 'dev' into feat/fachbereiche 2023-11-15 21:17:15 +01:00
f1f4e981dc
update spanisch 2023-11-15 21:14:34 +01:00
d65ff2d385 FS 2./3. Fremdsprache (#248)
All checks were successful
website-dev / dev-build (push) Successful in 26s
Reviewed-on: #248
2023-11-08 21:52:54 +01:00
4dda5e84a0
französisch, spanisch, latein, allgemeiner text 2023-11-08 21:52:15 +01:00
2c04c50b7f Merge branch 'dev' into feat/fachbereiche 2023-11-08 21:21:06 +01:00
26ad78ecf9 FS Englisch (#245)
All checks were successful
website-dev / dev-build (push) Successful in 33s
Reviewed-on: #245
2023-11-03 13:15:35 +01:00
5fa5bf84e6 fs englisch 2023-11-03 13:13:01 +01:00
18fda68917 Merge feat/fachbereiche into dev (#238)
Co-authored-by: Lilli Berthold <lilli.berthold@outlook.de>
Reviewed-on: #238
2023-11-03 13:13:01 +01:00
c1925bf774 add chemie fb
All checks were successful
website-dev / dev-build (push) Successful in 26s
2023-10-24 10:59:25 +02:00
47c463986a optimize layouts 2023-10-24 10:59:25 +02:00
827818ce98 adapt fachbereiche to new layout 2023-10-24 10:59:25 +02:00
84538d8024 revert dbcac7912dfe42264a334da00fd85155000b793b
revert „content/german/blog/informatik-biber-2022.md“ ändern
2023-10-24 10:59:25 +02:00
ee0043542b revert 71a1efd530ea37e3572e375a490bbf18c4c3c9bf
revert „content/german/blog/informatik-biber-2022.md“ ändern
2023-10-24 10:59:25 +02:00
3c95bca37d „content/german/blog/informatik-biber-2022.md“ ändern 2023-10-24 10:59:25 +02:00
b6a66aadb9 WIP 2023-10-24 10:59:25 +02:00
ea072ca9f1 WIP 2023-10-24 10:59:25 +02:00
eb9bea6f03 WIP 2023-10-24 10:59:25 +02:00
7334ff738e „content/german/blog/informatik-biber-2022.md“ ändern 2023-10-24 10:59:25 +02:00
3710ecec65 WIP 2023-10-24 10:59:25 +02:00
a3000b8dd5 WIP 2023-10-24 10:59:25 +02:00
6b42dbe83d menu config 2023-10-24 10:59:25 +02:00
1b89e7727c WIP 2023-10-24 10:59:25 +02:00
4655787893 WIP 2023-10-24 10:59:25 +02:00