 Andreas Österreicher
|
0b1e2ef919
|
Merge branch 'feature-78220/titel-tals-tag-migrieren' into feature-68298/Tempus_Grundstruktur
|
2026-09-10 12:59:27 +02:00 |
|
|
Andreas Österreicher
|
ce8beb6fd0
|
Merge branch 'bug/modification-of-tempus-base-plan-loading' into feature-68298/Tempus_Grundstruktur
|
2026-09-10 12:50:54 +02:00 |
|
|
Ivymaster
|
21c8bbbf90
|
Added check before droping all imported kalender events
|
2026-09-09 14:21:17 +02:00 |
|
|
Ivymaster
|
3dd46fa997
|
Minor mod
|
2026-09-09 14:05:57 +02:00 |
|
|
Ivymaster
|
9f4ca01068
|
BUG: Fixed issue with refreshing and importing kalender events
|
2026-09-09 09:34:15 +02:00 |
|
|
Ivymaster
|
260ede9d2f
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78220/titel-tals-tag-migrieren
|
2026-09-07 17:51:23 +02:00 |
|
|
Ivymaster
|
175b077d87
|
Added mod
|
2026-09-07 17:50:09 +02:00 |
|
|
Andreas Österreicher
|
f2d4840af6
|
Merge branch 'feature-78052/tempus-tag-events' into feature-68298/Tempus_Grundstruktur
|
2026-09-07 15:04:23 +02:00 |
|
|
Ivymaster
|
cde51fa165
|
BUG: Reintroduced status icon on tempus calender event
|
2026-09-07 14:31:40 +02:00 |
|
|
Ivymaster
|
22fd4f199e
|
BUG: Rework of setEmp in tempus component
|
2026-09-03 11:27:11 +02:00 |
|
|
Ivymaster
|
3e9788dcbf
|
BUG: Removed duplicates of setEmp in tempus component
|
2026-09-03 11:21:03 +02:00 |
|
|
Ivymaster
|
faa8f0446c
|
Conflicts resolved
|
2026-09-03 11:11:10 +02:00 |
|
|
ma0048
|
4c2cd86b6d
|
restore deleted setemp function
|
2026-09-03 11:06:25 +02:00 |
|
|
Ivymaster
|
563fda603a
|
BUG: Room suggestions preview
|
2026-09-03 11:02:02 +02:00 |
|
|
ma0048
|
492c9a0140
|
fix: rebuild Raumvorschlag after adding event
|
2026-09-02 15:28:05 +02:00 |
|
|
Ivymaster
|
02ff8d0e3c
|
Conflicts resolved
|
2026-09-02 15:01:56 +02:00 |
|
|
ma0048
|
90f62a7a9e
|
- merged master
- added raumvorschlag slots
|
2026-09-02 10:54:36 +02:00 |
|
|
Ivymaster
|
fd6d4095b9
|
Conflicts resolved
|
2026-09-01 13:22:46 +02:00 |
|
|
Ivymaster
|
3c333af184
|
Minor bug fixes
|
2026-09-01 13:15:29 +02:00 |
|
|
ma0048
|
eeb49e1967
|
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
|
2026-09-01 13:08:38 +02:00 |
|
|
ma0048
|
1d61652b67
|
Merge remote-tracking branch 'origin/feature-78211/tempus_kollisionscheck_auf_lehreinheit_id_umbauen_' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
|
2026-09-01 12:59:22 +02:00 |
|
|
ma0048
|
8a448fde3c
|
Merge remote-tracking branch 'origin/feature-78288/tempus_usability' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# public/css/components/horizontalsplit.css
# public/js/components/Tempus/Filters/searchbarOptions.js
|
2026-09-01 12:48:07 +02:00 |
|
|
ma0048
|
1361c3fc00
|
Merge remote-tracking branch 'origin/feature-78286/tempus_berechtigungen' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# application/libraries/KalenderLib.php
|
2026-09-01 12:42:16 +02:00 |
|
|
ma0048
|
d727012806
|
Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# system/dbupdate_3.4.php
|
2026-09-01 12:32:38 +02:00 |
|
|
ma0048
|
b91ba9fdbb
|
Merge remote-tracking branch 'origin/feature-78324/tempus_coursepicker_lektor' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# public/js/components/Tempus/Coursepicker.js
|
2026-09-01 12:28:32 +02:00 |
|
|
ma0048
|
e311d7ee00
|
Merge remote-tracking branch 'origin/feature-78289/tempus_parken_features' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:22:25 +02:00 |
|
|
ma0048
|
357a51bdcb
|
Merge remote-tracking branch 'origin/feature-78317/tempus_delete_status' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:21:53 +02:00 |
|
|
ma0048
|
61ef27e5eb
|
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
|
2026-09-01 12:20:12 +02:00 |
|
|
ma0048
|
a26b75bc3c
|
Merge remote-tracking branch 'origin/feature-78179/tempus_listenansicht_datumfilter' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:17:16 +02:00 |
|
|
Ivymaster
|
61d7268f90
|
Conflicts resolved
|
2026-09-01 11:52:25 +02:00 |
|
|
ma0048
|
fb36b2a548
|
- merged master
- updaed Verbandsbaum to work with the new version
|
2026-08-31 14:58:27 +02:00 |
|
|
ma0048
|
51886960bb
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
|
2026-08-31 12:49:28 +02:00 |
|
|
ma0048
|
98be0b43b7
|
- permissions geandert
|
2026-08-27 08:08:34 +02:00 |
|
|
ma0048
|
4cbf37d727
|
- ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit
|
2026-08-27 08:07:39 +02:00 |
|
|
ma0048
|
623e8007b0
|
- sichtbarkeitsstatus hinzugefuegt
- tage ausblendbar
- lektor zur lvverwaltung verlinkt
- vertical splitter hinzugefuegt
- anzahl der einheiten hinzugefuegt
|
2026-08-26 09:01:47 +02:00 |
|
|
Harald Bamberger
|
6d641bbd06
|
pass in uid by reference
|
2026-08-24 13:56:55 +02:00 |
|
|
Harald Bamberger
|
3455aed3f5
|
Merge branch 'bhdev_master_stundenplan'
|
2026-08-24 13:46:09 +02:00 |
|
|
Harald Bamberger
|
f84d12277d
|
remove debug code
|
2026-08-24 07:31:47 +02:00 |
|
|
Harald Bamberger
|
9bf5bc2ad9
|
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
|
2026-08-24 07:26:12 +02:00 |
|
|
Harald Bamberger
|
27765606e3
|
bufix akadGrad by sex if exists
|
2026-08-20 19:31:37 +02:00 |
|
|
Harald Bamberger
|
75d2cabdbe
|
bugfix lv-plan
|
2026-08-20 15:10:26 +02:00 |
|
|
Harald Bamberger
|
bae9d6d9a0
|
Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning'
|
2026-08-19 17:11:12 +02:00 |
|
|
Harald Bamberger
|
43d6a882ce
|
add padding to tags buttons, remove orphanded template closing tag
|
2026-08-19 17:07:25 +02:00 |
|
|
Harald Bamberger
|
7f3b4100ab
|
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
|
2026-08-19 15:07:07 +02:00 |
|
|
Harald Bamberger
|
9f54ecce54
|
Merge branch 'epic/LVEvaluierung-Neu'
|
2026-08-19 13:59:00 +02:00 |
|
|
Cristina
|
7af0f4a478
|
Merge remote-tracking branch 'origin/epic/LVEvaluierung-Neu' into epic/LVEvaluierung-Neu
|
2026-08-19 13:35:25 +02:00 |
|
|
Cristina
|
0f843db33d
|
Merge branch 'master' into epic/LVEvaluierung-Neu
|
2026-08-19 13:34:53 +02:00 |
|
|
Cristina
|
3e59648d5b
|
Merge branch 'master' into epic/LVEvaluierung-Neu
|
2026-08-19 12:55:38 +02:00 |
|
|
Cristina
|
5923991848
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2026-08-19 12:55:03 +02:00 |
|
|
Harald Bamberger
|
55a6ec9d0d
|
fix handling of grundbetrag and betrag_valorisiert
|
2026-08-19 11:48:22 +02:00 |
|