blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-20 02:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,510 Commits 223 Branches 8 Tags
a99730b3697efe8dab6bb1514080ceff7eb2d05e
Commit Graph
19510 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ivymaster a99730b369 BUG: Fixed issue with reverting failed updated events 2026-09-11 09:58:47 +02:00
Ivymaster 26b779e864 Conflicts resolved 2026-09-10 14:21:20 +02:00
ma0048 606c5143de fix: deleting calendar events that have a location but no room 2026-09-10 13:15:00 +02:00
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 76fe4f567c Reverted default event loader to previous version 2026-09-09 13:58:43 +02:00
Ivymaster 5d0c6c1b4e Dedicated tempus event loader updated 2026-09-09 13:57:47 +02:00
Ivymaster 45b6c190b6 Conlflicts resolved 2026-09-09 13:21:17 +02:00
Ivymaster c91a6c6376 Reverted to original eventLoader 2026-09-09 13:09:48 +02:00
Ivymaster ed02955b49 BUG: Fixed issue with event reload span 2026-09-09 13:08:49 +02:00
Ivymaster 4ecd4b5a65 BUG: Fixed issue witd drag drop animation 2026-09-09 12:21:46 +02:00
Ivymaster 9f4ca01068 BUG: Fixed issue with refreshing and importing kalender events 2026-09-09 09:34:15 +02:00
Ivymaster 6ea1d4610d Conflicts resolved 2026-09-08 10:20:52 +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 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 f0b1689a06 Third cherry pick of modifing event loading 2026-09-01 17:50:54 +02:00
Ivymaster 6e6cb8ae11 Second cherry pick of modifing event loading 2026-09-01 17:26:24 +02:00
Ivymaster 1bbe4368bb First cherry pick of modifing event loading 2026-09-01 17:19:20 +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
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