blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-26 13:53:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,663 Commits 234 Branches 8 Tags
545316aea2cffd95e850756485698bd3ea18f894
Commit Graph
2970 Commits
Author SHA1 Message Date
Ivymaster 545316aea2 Merge branch 'feature-68298/Tempus_Grundstruktur' into test-83711/Tempus_Automatisierte_Tests 2026-10-15 10:56:39 +02:00
ma0048 3dec37f171 Make reservation participants editable 
Shared modal components (time, room, collision, tags, participants)
Jump to collisions
Fix: semester 0 for Lehrverband groups
 2026-10-14 14:51:43 +02:00
ma0048 9993f3b96e filtervar for isCollisionCheckEnabled 2026-10-14 11:27:12 +02:00
Ivymaster 8a2d7f9ae4 BUG: Added conflict checking and max daily limit ofr lecturere and student month view 2026-10-14 10:30:49 +02:00
Ivymaster b1fb9624ee WIP 2026-10-14 09:50:54 +02:00
Ivymaster d70a5cc731 Conflicts resolved 2026-10-13 11:03:27 +02:00
ma0048 83d8884df3 Merge branch 'master' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/models/education/Lehreinheit_model.php
 2026-10-06 12:57:38 +02:00
ma0048 6ae321280e - Listenansicht hoehe der Tabelle auf 100% 
- Listenansicht "status" Delete entfernt, Button gelassen
- Tags ohne Dialog & Popaus aus dem Kontextmenue entfernt
- Einstellung Prioraum verwenden Raumauswahl anzeigen als Dropdown
- Sortierung der Raeume im Event
- Reservierung anzeigen wenn STG Filter gesetzt ist
- Course Picker kuerzen von Events erst nach Confirm
- Fehlende Phrasen hinzugefuegt
 2026-10-06 12:53:40 +02:00
Harald Bamberger efc8fa1eeb Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router 2026-10-06 10:27:46 +02:00
Harald Bamberger 4ba2869632 Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters 2026-10-05 11:22:59 +02:00
ma0048 07f258248b Merge branch 'master' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	system/dbupdate_3.4.php
 2026-10-01 14:02:32 +02:00
Harald Bamberger 76a8e00edf Merge branch 'master' into feature-77757/WidgetsBerechtigung 2026-09-30 15:23:08 +02:00
ma0048 89fb90aef3 Added into ListView: 
- Raumverschiebung
- Sichtbarkeitsstatus Änderung
- Tags hinzufügen/bearbeiten/löschen

ModalContent:
- Mailversandmöglichkeit
- Letzte Änderung der Zeitwünsche
- Anzahl Studierende
- Kollisionsinformation Details
- Tags des Eintrags anzeigen
- Anmerkungen zum LV-Teil
- Voller Name des Lehrenden
- Raumoptimierungs
- Sprung zur LV-Verwaltung (derzeit deaktiviert)
- Sprung zur Lehrveranstaltungsadminsitration (Vilesci)
- Lektor & Raum hinzufügen zum Filter
 2026-09-29 11:12:41 +02:00
ma0048 e369a8c03f LV-Verwaltung: 
- Semester unter Orgform im Verbandsbaum
- Kombinierte LV/LE-Suche
- Semester/Orgform/Lehrform in Suchergebnissen
 2026-09-28 08:42:37 +02:00
Harald Bamberger 15c1da74a2 CisMenu: do not overwrite calculated url if menuitem is multiple times in menu tree 2026-09-23 16:09:42 +02:00
Harald Bamberger d33b45d7cb Merge branch 'bhdev_backport_compat' 2026-09-23 14:58:26 +02:00
Andreas Österreicher 2050f5ae65 Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool' 2026-09-23 11:14:01 +02:00
Andreas Österreicher 5ec1a1c54c Merge branch 'feature-77686/infocentertool_status_setzen_fuer_zgv_pruefung_soll_message_ausloesen' 2026-09-23 10:56:54 +02:00
Harald Bamberger 8b44e4475b Merge branch 'master' of github.com:FH-Complete/FHC-Core into bhdev_backport_compat 2026-09-22 16:51:34 +02:00
Harald Bamberger d251987850 backport compat controller and component 2026-09-22 16:50:56 +02:00
Harald Bamberger ba92eea7eb studvw: fix lvtermine student_lehrverband 2026-09-22 14:09:51 +02:00
Harald Bamberger 8eb27b194f add target attribute to redirect content menu entries, use entry target attribute if set when rendering cis4 menu 2026-09-18 17:12:30 +02:00
ma0048 faad2c4a9a lv auch anzeigen wenn keine lvteile in dem semester dran haengen 
phrasen hinzugefuegt
 2026-09-18 12:34:47 +02:00
Ivymaster bf050c9297 Dropped calender group id column from notizzuordnung and update migrateKalender commands 2026-09-17 11:02:35 +02:00
Alexei Karpenko 0dadaece08 Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool 2026-09-16 16:59:09 +02:00
ma0048 2ffaf36270 suche fuer lehreinheiten und lehrveranstaltungen in der lvverwaltung 2026-09-15 15:46:48 +02:00
Johann Hoffmann 69fd223358 fix load projektarbeit.studiensemester_kurzbz for fetchProjektarbeitById in order to query getDefaultStundensaetze successfully 2026-09-15 11:49:19 +02:00
Harald Bamberger 9c43374267 Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-09-15 07:53:10 +02:00
Harald Bamberger 6dfe292776 API LV: extend regex to allow studiengang_kz 0 2026-09-14 11:09:45 +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
Alexei Karpenko 073160dde4 Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool 2026-09-10 20:08:08 +02:00
Ivymaster 26b779e864 Conflicts resolved 2026-09-10 14:21:20 +02:00
Ivymaster 21c8bbbf90 Added check before droping all imported kalender events 2026-09-09 14:21:17 +02:00
adisposkofh 67f30c7765 fixed issue with wrong semester displayed and wrong ical dates used in my lv plan 2026-09-09 11:30:43 +02:00
Andreas Österreicher 1bf2b707ef Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-09-09 09:43:11 +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
Andreas Österreicher bf29faa5a7 Merge branch 'feature-82292/Cis4StudiumLVohneModulAnzeigen' 2026-09-02 15:20:28 +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