 Ivymaster
|
63af8efb44
|
Conflict resolved
|
2026-09-07 18:00:00 +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
|
669e03b915
|
Conflicts resolved
|
2026-09-01 13:19:17 +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
|
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 |
|
|
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
|
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
|
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
|
75d2cabdbe
|
bugfix lv-plan
|
2026-08-20 15:10:26 +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
|
55a6ec9d0d
|
fix handling of grundbetrag and betrag_valorisiert
|
2026-08-19 11:48:22 +02:00 |
|
|
Harald Bamberger
|
8d9113d5c8
|
Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person
|
2026-08-19 08:06:16 +02:00 |
|
|
Harald Bamberger
|
7ce81ad4bd
|
Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung'
|
2026-08-19 07:57:07 +02:00 |
|
|
ma0048
|
8184555e12
|
location hinzugefuegt
raumlose planung aktivierbar/deaktivierbar
automatische zuteilung zum priorraum aktivierbar/deaktivierbar
raum zuteilung ueber dialog aktivierbar/deaktivierbar
|
2026-08-13 13:36:35 +02:00 |
|
|
ma0068
|
afb8011347
|
bugfix manual rebuilding of Tag ZGV Missing
|
2026-08-13 12:57:49 +02:00 |
|
|
Harald Bamberger
|
6d5a4531e1
|
use tbl_studentlehrverband.semester instead of tbl_student.semester
|
2026-08-12 16:58:21 +02:00 |
|
|
ma0068
|
15beaa9be8
|
Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning' of github.com:FH-Complete/FHC-Core into feature-78257/StudVW_Und_Tags_Finetuning
|
2026-08-12 12:42:10 +02:00 |
|
|
ma0068
|
574057da88
|
add masterzgv to CoremissingZgvLib
|
2026-08-12 12:41:39 +02:00 |
|
|
Harald Bamberger
|
c81b5338de
|
Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung
|
2026-08-12 11:39:49 +02:00 |
|
|
chfhtw
|
30c4e565dd
|
bugfix: sprache index in studentlistlib corrected
|
2026-08-11 15:08:34 +02:00 |
|
|
ma0048
|
015c8ca0f1
|
kollisionscheck auf lehreinheit_id umgebaut
raumvorschlag by lehreinheit hinzuegfuegt
|
2026-08-11 11:48:29 +02:00 |
|
|
Werner Masik
|
d66fe72cc9
|
add field for salary adaption type (Ersteinstufung, indiv. Erhöhung, ..)
|
2026-08-11 11:18:36 +02:00 |
|
|
ma0048
|
b58b4446a9
|
todelete auf to_delete umebannnt
to_delete_live & to_delete_preview hinugefuegt
history logik umbau
|
2026-08-10 10:57:34 +02:00 |
|
|
Harald Bamberger
|
cd87ecc2d9
|
fix assign batchUser
|
2026-08-06 15:00:35 +02:00 |
|
|
Ivymaster
|
1b23662a54
|
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
|
2026-08-06 13:46:11 +02:00 |
|
|
Ivymaster
|
96526be231
|
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
|
2026-08-06 13:43:20 +02:00 |
|
|
Ivymaster
|
a912fcf019
|
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
|
2026-08-06 13:20:51 +02:00 |
|
|
ma0048
|
785246f58f
|
fixed Sync Bug - Planning -> Voransicht -> Live -> Planning -> Voransicht -> Delete lässt einträge in der History auf Live
|
2026-08-05 12:35:41 +02:00 |
|
|
ma0048
|
a74f679917
|
fixed Sync Bug - Planning -> Voransicht -> Live -> Planning -> Voransicht -> Delete lässt einträge in der History auf Live
|
2026-08-05 12:14:53 +02:00 |
|
|
ma0048
|
6282cb0402
|
hinzugefuegt:
- alle anzeigen option
- jetzt starten knopf
- oe rekursiv
|
2026-08-05 11:12:33 +02:00 |
|
|
Ivymaster
|
45b0268105
|
BUG: Added reload of events on lang change, for tag display update
|
2026-08-04 11:35:06 +02:00 |
|
|
ma0048
|
8636364c08
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-77949/tempus_synchronisation
# Conflicts:
# system/dbupdate_3.4.php
|
2026-08-03 12:31:07 +02:00 |
|
|
Harald Bamberger
|
9f68fe6b3b
|
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
|
2026-08-03 11:18:34 +02:00 |
|
|
Harald Bamberger
|
7c9f6d89d6
|
move setting index_bezeichnung_mehrsprachig to StudentListLib
|
2026-08-03 10:43:53 +02:00 |
|
|
Ivymaster
|
7759884d8d
|
Add max daily event amount limit for month view
|
2026-08-03 09:42:23 +02:00 |
|
|
Ivymaster
|
9352d5cd46
|
Add disabling of collision check for month view
|
2026-08-03 09:40:10 +02:00 |
|
|
Harald Bamberger
|
3d728fd884
|
Merge branch 'master' into studvw_lvvw_2026_08_rc
|
2026-07-31 15:51:35 +02:00 |
|
|
chfhtw
|
2b4aef5633
|
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
|
2026-07-31 12:52:29 +02:00 |
|
|
Harald Bamberger
|
b9d4aefd5e
|
add meta info
|
2026-07-31 11:02:46 +02:00 |
|
|
ma0048
|
cc3b47a10e
|
Raumzuteilung Entfernen / Hinzufuegen von Raeumen
Lehreinheiten entfernen
|
2026-07-31 10:34:15 +02:00 |
|
|
Harald Bamberger
|
69048f8f48
|
bugfix semester calculation between semesters
|
2026-07-31 09:51:04 +02:00 |
|