ma0048 2b7f56622c Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung ...

# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/organisation/Studienplan_model.php
#	application/models/person/Notiz_model.php
#	application/models/ressource/Mitarbeiter_model.php
#	public/js/components/Stv/Studentenverwaltung.js
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php

2025-08-07 11:03:05 +02:00

..

dbupdate_3.2

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

dbupdate_3.4

Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung

2025-08-07 11:03:05 +02:00

services

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

sync

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

templates

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

UnitTests

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

vorlage_zip

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

xsl

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

.htaccess_exmpl

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

ampel_erinnerungsmail.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

check_neue_lektoren.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

check_studentlehrverband.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

checkroles.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

checkStudenten.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

checksystem.php

moved email template to fhtw addon; einheiten column visibility default false since pausen are not represented; backend code cleanup; phrase fix;

2024-11-11 09:56:43 +01:00

dbupdate_3.0.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

dbupdate_3.1.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

dbupdate_3.2.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

dbupdate_3.3.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

dbupdate_3.4.php

Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung

2025-08-07 11:03:05 +02:00

environment.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

erinnerungsmail_coodle.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

erinnerungsmail_sek_lehrauftrag.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

erinnerungsmail_sek_preinteressent.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

fehlerupdate.php

Fehlerkurzbz korrigiert

2025-05-20 11:31:28 +02:00

FH-Complete.txp

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

FHComplete-3.3.sql

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

FHCompleteTDM3PG83.xsl

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

filtersupdate.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

generate_missing_sto.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

generatestudienordnung.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

konsistenzpruefung.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

matrikelnummer_clearing_download.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

matrikelnummer_clearing_import.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

phpinfo.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

phrasesupdate.php

Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung

2025-08-07 11:03:05 +02:00

prestudentstatus_studienplan_id.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

pruefung_bestaetigen.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

system_check_sql.php

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00