 Ivymaster
|
3acf7da82c
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-18 11:29:40 +02:00 |
|
|
Ivymaster
|
bf050c9297
|
Dropped calender group id column from notizzuordnung and update migrateKalender commands
|
2026-09-17 11:02:35 +02:00 |
|
|
Ivymaster
|
8bac1c1ebb
|
WIP: Special view for page printing
|
2026-09-15 14:23:15 +02:00 |
|
|
Ivymaster
|
c0e2b8f25d
|
Merge branch 'feature-78281/tempus_mehrwochenansicht_new' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-14 16:11:11 +02:00 |
|
|
Ivymaster
|
9e65b6788d
|
BUG: Fix issues with grid layout from big conflicts
|
2026-09-14 16:09:27 +02:00 |
|
|
Ivymaster
|
b10eba44ca
|
Conflits resolved
|
2026-09-14 14:38:17 +02:00 |
|
|
Ivymaster
|
6d216945b7
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78281/tempus_mehrwochenansicht_new
|
2026-09-14 11:09:02 +02:00 |
|
|
Ivymaster
|
e1af778d8f
|
Implemented custom table for kalender notiz, and added postgres triffer function for removing resources and stale notes
|
2026-09-11 14:27:17 +02:00 |
|
|
Ivymaster
|
26b779e864
|
Conflicts resolved
|
2026-09-10 14:21:20 +02:00 |
|
|
Ivymaster
|
5dc314febd
|
Included cherrypicked commits from lv plan range branch
|
2026-09-09 15:13:16 +02:00 |
|
|
Ivymaster
|
21c8bbbf90
|
Added check before droping all imported kalender events
|
2026-09-09 14:21:17 +02:00 |
|
|
Ivymaster
|
9f4ca01068
|
BUG: Fixed issue with refreshing and importing kalender events
|
2026-09-09 09:34:15 +02:00 |
|
|
Ivymaster
|
63af8efb44
|
Conflict resolved
|
2026-09-07 18:00:00 +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
|
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
|
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
|
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
|
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
|
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 |
|
|
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
|
92d27fc242
|
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
|
2026-08-18 14:52:41 +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 |
|
|
ma0048
|
b2aa4c4922
|
stundenraster mit eigener berechtigung basis/tempus_stundenraster deaktivierbar
|
2026-08-12 11:39:17 +02:00 |
|
|
ma0048
|
33b50bf479
|
course picker
- kurse vom lektor koennen angezeigt werden
- searchbar button hinzuefuegt um kurse vom lektor im course picker zu laden
|
2026-08-12 11:10:07 +02:00 |
|
|
ma0048
|
015c8ca0f1
|
kollisionscheck auf lehreinheit_id umgebaut
raumvorschlag by lehreinheit hinzuegfuegt
|
2026-08-11 11:48:29 +02:00 |
|
|
Harald Bamberger
|
10218305db
|
Merge branch 'bug-78116/StudStatus_sendStglSammelmail_empty_list'
|
2026-08-11 10:40:26 +02:00 |
|
|
ma0068
|
31bae9b693
|
use function getStgAndDetails instead of getStgAndSem
|
2026-08-11 09:48:17 +02:00 |
|
|
adisposkofh
|
59ac56374e
|
removed redundant response meta used for dev
|
2026-08-11 09:44:41 +02:00 |
|
|
adisposkofh
|
a397460e0e
|
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
|
2026-08-11 09:43:27 +02:00 |
|
|
Harald Bamberger
|
046a552f34
|
Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung
|
2026-08-11 08:11:55 +02:00 |
|
|
Harald Bamberger
|
e8a534f0fe
|
Cis MyLv Endpoints only require logged in user
|
2026-08-11 07:52:02 +02:00 |
|
|
adisposkofh
|
108f91ea1a
|
quick copy option on full name and title in profile and other lv plan
|
2026-08-10 17:09:31 +02:00 |
|
|
Harald Bamberger
|
736e897928
|
fix automated tags not found in stv search
|
2026-08-06 16:23:54 +02:00 |
|
|
Ivymaster
|
5d284c28e3
|
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
|
2026-08-06 13:47:55 +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
|
6282cb0402
|
hinzugefuegt:
- alle anzeigen option
- jetzt starten knopf
- oe rekursiv
|
2026-08-05 11:12:33 +02:00 |
|
|
Ivymaster
|
fd74edbe16
|
Add old tempus stundenplan title as tag for new tempus kalendar event
|
2026-08-04 08:53:55 +02:00 |
|