ma0048
|
eb26f4a15f
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into demo
# Conflicts:
# system/dbupdate_3.4.php
|
2026-04-16 14:45:00 +02:00 |
|
ma0048
|
13e8a1a9f6
|
bug fixed + infocenter performance
|
2026-04-16 14:21:02 +02:00 |
|
ma0048
|
b6c2f2c9c9
|
Merge remote-tracking branch 'origin/master' into demo
# Conflicts:
# application/models/education/Projektarbeit_model.php
# application/views/CisRouterView/CisRouterView.php
# public/css/Cis4/Cis.css
# public/js/api/factory/studiensemester.js
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
# system/phrasesupdate.php
|
2026-04-01 11:34:28 +02:00 |
|
ma0068
|
b90c26412a
|
DB update: new Organisationseinheittyp Programm
|
2026-03-20 13:06:16 +01:00 |
|
Harald Bamberger
|
e12b7e1ed5
|
add indexes for person_id to table msg_message and msg_recipient, ensure tabulator data request is made before requests of create msg components
|
2026-02-17 08:06:30 +01:00 |
|
Andreas Österreicher
|
023c2a10be
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2026-02-04 10:21:17 +01:00 |
|
Harald Bamberger
|
a3a03f6362
|
update check system to create or update widget path to start with public/...
|
2026-02-03 13:49:06 +01:00 |
|
Andreas Österreicher
|
b2f8427475
|
Merge branch 'master' into demo
|
2026-01-27 13:53:05 +01:00 |
|
Johann Hoffmann
|
709aba5783
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# application/models/organisation/Studiengang_model.php
|
2026-01-26 15:06:22 +01:00 |
|
Cristina
|
9b90e0edde
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-20 10:53:36 +01:00 |
|
Andreas Österreicher
|
47ea1e848c
|
Merge branch 'feature-69528/reihungstestueberwachung_constructor'
|
2026-01-19 10:17:38 +01:00 |
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|
Andreas Österreicher
|
d86f8d4114
|
Merge branch 'epic-56039/LV-Evaluierung' into demo
|
2025-12-18 13:46:11 +01:00 |
|
Andreas Österreicher
|
ea17847fad
|
Merge branch 'master' into demo
|
2025-12-18 13:40:45 +01:00 |
|
Andreas Österreicher
|
7e6805ca98
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2025-12-18 13:18:16 +01:00 |
|
Andreas Österreicher
|
47e3c83909
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-12-18 12:25:05 +01:00 |
|
Harald Bamberger
|
a86d35f731
|
Merge branch 'master' into feature-69065/Projektarbeiten_Firmen_verwalten
|
2025-12-11 12:12:05 +01:00 |
|
Alexei Karpenko
|
98bcbda53e
|
added check for Projektarbeitsbeurteilung when deleting Projektarbeit
|
2025-12-10 16:09:44 +01:00 |
|
Cristina
|
76cdaefdc7
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2025-12-09 17:06:06 +01:00 |
|
Johann Hoffmann
|
bb689a6d48
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# public/css/Cis4/Cis.css
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-12-09 17:03:18 +01:00 |
|
Andreas Österreicher
|
e1959b9e40
|
Quality Gate Aenderungen im DBUpdate hinzugefügt
|
2025-12-05 13:21:46 +01:00 |
|
ma0048
|
5c9710f44d
|
externe ueberwachung v1
|
2025-12-02 13:49:05 +01:00 |
|
Cristina
|
4ab0c0a44e
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-11-13 10:44:39 +01:00 |
|
chfhtw
|
77604c5e15
|
StV: Font Size setting
|
2025-11-12 08:02:06 +01:00 |
|
Harald Bamberger
|
c97e1b6453
|
Merge branch 'feature-67490/studstatus_suche_abort_controller_haengt'
|
2025-11-05 11:06:32 +01:00 |
|
Cristina
|
343964750b
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-10-14 17:22:39 +02:00 |
|
Andreas Österreicher
|
9927667086
|
Merge branch 'feature-47972/pruefungsverwaltung_ects_angabe'
|
2025-10-07 12:53:52 +02:00 |
|
Andreas Österreicher
|
4ea486d320
|
Merge branch 'epic-56039/LV-Evaluierung' into demo
|
2025-10-06 12:04:35 +02:00 |
|
Andreas Österreicher
|
666a6ea42c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-10-02 14:32:00 +02:00 |
|
Cristina
|
0d51df95f9
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-10-02 11:30:55 +02:00 |
|
Andreas Österreicher
|
e6fb47b335
|
Merge branch 'epic-56039/LV-Evaluierung' into demo
|
2025-10-01 14:45:35 +02:00 |
|
Harald Bamberger
|
10b6641aa2
|
Merge branch 'master' into feature-63394/StV_Favoriten_64_Zeichen_Variablenbeschraenkung
|
2025-09-30 14:51:10 +02:00 |
|
ma0048
|
6abdb25c0a
|
abort controller fixed und index auf campus.tbl_studierendenantrag_status.studierendenantrag_id hinzugefuegt
|
2025-09-24 09:33:41 +02:00 |
|
Harald Bamberger
|
eaec76c3d2
|
Merge branch 'master' into feature-63437/cis4_iframe_component
|
2025-09-22 17:03:42 +02:00 |
|
Alexei Karpenko
|
473715c25c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-09-18 17:39:31 +02:00 |
|
ma0048
|
6a31eade8b
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-09-18 15:04:01 +02:00 |
|
Andreas Österreicher
|
012ae4ac62
|
Berufsschule für Lehrlinge als aktivität hinzugefügt in der
Zeitaufzeichnung
|
2025-09-12 09:39:06 +02:00 |
|
chfhtw
|
d9c716a62b
|
convert wert from public.tbl_variable to TEXT
|
2025-09-12 08:37:18 +02:00 |
|
Cristina
|
594333889d
|
Merge branch 'epic-56039/LV-Evaluierung_NEU' of https://github.com/FH-Complete/FHC-Core into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-09-03 15:14:53 +02:00 |
|
ma0048
|
0d1cf2b043
|
autocomplete bei den kompatiblen lvs beruecksichtigen
|
2025-09-01 09:20:33 +02:00 |
|
ma0048
|
34528bb014
|
iframe content hinzugefuegt
|
2025-08-29 13:19:00 +02:00 |
|
ma0048
|
26db68726a
|
Merge branch 'refs/heads/master' into demo
# 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-27 09:22:35 +02:00 |
|
ma0048
|
eb8c3213df
|
- ects angabe bei der anmeldung
- tablesorter hinzugefuegt
- pruefungsort anderer raum moeglich (text)
- pruefungsanmeldungen nur noch studiensemester dropdown
- kompatible lvs vergleichen
|
2025-08-19 07:37:33 +02:00 |
|
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 |
|
Harald Bamberger
|
37b67641ef
|
Merge branch 'feature-40128/Mehrere_Suchergebnisse_für_selbe_Person' into rc1_FHC4_C4
|
2025-08-01 16:19:23 +02:00 |
|
ma0048
|
57af813cb4
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-07-11 07:41:17 +02:00 |
|
Harald Bamberger
|
ed17e87afd
|
dbupdate create Cis40 dashboard if it does not exist, 61730_Dashboard_Anpassungen only output message if something was updated
|
2025-06-30 14:51:42 +02:00 |
|
Cristina
|
fd2de106f8
|
Added column evaluierung to lehre.tbl_lehrveranstaltung
- evaluierung (boolean) indicates if lehrveranstaltung shall be evaluated. Default is true.
|
2025-06-24 15:02:45 +02:00 |
|
cgfhtw
|
f596f16255
|
Merge branch 'master' into feature-40128/Mehrere_Suchergebnisse_für_selbe_Person
|
2025-06-17 09:24:18 +02:00 |
|
Andreas Österreicher
|
909d7f62f2
|
Merge branch 'feature-40314/Electronic_Onboarding_Anbindung_IDA' into demo
|
2025-06-16 11:02:52 +02:00 |
|