8e7a1a2ddd
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-09-22 13:39:36 +02:00
473715c25c
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
2025-09-18 17:39:31 +02:00
41dbd83bdb
phrases
...
tags als default entfernt
master gemerged
2025-09-18 15:27:04 +02:00
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
57531d956d
gruppen in eigenen tab verschoben
...
styling
phrases
2025-09-18 13:18:44 +02:00
e80cfc207e
Merge branch 'feature-63370/AnwesenheitenMicrotuning'
2025-09-17 14:59:49 +02:00
aca4195df6
stv kontaktieren tab hinzugefuegt
2025-09-17 11:01:08 +02:00
34eb373061
adapt phrase profilUpdateInformationMessage
2025-09-16 13:39:15 +02:00
cb5623d228
label and layout for documents
2025-09-16 13:32:28 +02:00
9e6ae4f5a4
add phrase lehre/termineImLvPlan
2025-09-15 11:31:35 +02:00
b8d197d923
deleted entschuldigung email betreff
2025-09-12 13:50:25 +02:00
012ae4ac62
Berufsschule für Lehrlinge als aktivität hinzugefügt in der
...
Zeitaufzeichnung
2025-09-12 09:39:06 +02:00
d9c716a62b
convert wert from public.tbl_variable to TEXT
2025-09-12 08:37:18 +02:00
20f7c2e841
Merge branch 'master' into feature-63370/AnwesenheitenMicrotuning
2025-09-11 13:06:46 +02:00
c9425a0061
'fileuploaddatum' phrase => 'FileUpload-Datum'
2025-09-10 11:20:32 +02:00
b95dd49d0e
assistenz uploaddatum -> antragsdatum; added new column 'fileuploaddatum';
2025-09-10 10:44:43 +02:00
eee9d6b691
raumsuche phrasen change & fix; fhcapi -> api; lvMenu try to use phrasenkey for responsiveness instead of the already looked up phrase; tried investigating news carousel bug, not sure if bug or feature - at least declared non changing variables as const;
2025-09-08 17:28:09 +02:00
1b76b852cf
Merge branch 'master' into feature-63435/Studierendenverwaltung_Studierende_Verbandsgruppen_und_Spezialgruppen_zuordnen_Multiaktion
2025-09-05 14:02:48 +02:00
6fb06397be
Merge branch 'master' into feature-63359/StV_API_error_clustering
2025-09-04 14:32:10 +02:00
2c3754b33f
more tooltips so people can avoid reading the wiki
2025-09-03 13:51:41 +02:00
eae7ac1f15
Merge branch 'master' into feature-47972/pruefungsverwaltung_ects_angabe
2025-09-03 06:53:07 +02:00
86641ea02d
StV: Lehrverband- & Special-groups
2025-09-02 16:06:04 +02:00
fc845ebf4e
Studierendenverwaltung Projektarbeit: separate saving of Projektarbeit and Betreuer, added action for editing Betreuer
2025-09-02 15:04:45 +02:00
fa6d651b21
phrasen & permissionLib/Phrases reference $param in lvMenuBuild event
2025-09-01 16:48:24 +02:00
0d1cf2b043
autocomplete bei den kompatiblen lvs beruecksichtigen
2025-09-01 09:20:33 +02:00
34528bb014
iframe content hinzugefuegt
2025-08-29 13:19:00 +02:00
db61320b8c
Merge branch 'master' into feature-47972/pruefungsverwaltung_ects_angabe
2025-08-29 12:57:39 +02:00
3a5c4444cb
Tab Archive: Documentdropdown for Printing
...
- define structure for single print array
- fill array with documents according to Fas Dropdown Drucken
- event for adding documents from extension/addons
2025-08-27 14:11:03 +02:00
9a35ee5945
raum content im alten cis wieder auf tablesorter
2025-08-27 11:48:35 +02:00
1025a8b461
Removed Duplicate Phrase
2025-08-25 11:19:20 +02:00
ce9a4e2e09
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-08-23 16:16:41 +02:00
1e68eb0b90
berechtigungsprüfung 'lehre/benotungstool:rw' in Noten Controller; API Method documentation; removed addMeta statements; removed Tabulator Event logging;
2025-08-21 13:35:38 +02:00
d6c7f16ceb
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
2025-08-19 13:43:23 +02:00
9707258e62
Merge remote-tracking branch 'origin/master' into feature-61592/AnwesenheitenFinetuning
...
# Conflicts:
# public/js/components/Bootstrap/Modal.js
# system/phrasesupdate.php
2025-08-19 09:43:30 +02:00
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
42a81a4558
API error clustering
2025-08-18 13:06:59 +02:00
b9e3c47be9
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
2025-08-14 18:03:36 +02:00
e7f58ca1ba
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
2025-08-13 07:33:13 +02:00
80f1edca8f
Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
2025-08-11 15:25:16 +02:00
3c9db86df2
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/config/routes.php
# application/controllers/api/frontend/v1/Lehre.php
# application/models/education/Lehrveranstaltung_model.php
# application/views/CisRouterView/CisRouterView.php
# public/js/apps/Dashboard/Fhc.js
# system/phrasesupdate.php
2025-08-07 15:17:10 +02:00
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
9ad2198b02
update phrase Stundenplan => LV-Plan, Feiertag => Ferien / Feiertag, Holiday => Holidays
2025-08-06 11:14:37 +02:00
c96db9f573
reworked StV favorites (only 1st tier version)
2025-08-06 11:06:57 +02:00
0605baf68f
capitalize tab phrases; style&phrase change for Attendance Check Date Datepicker; Picture col min width icrease so the title is readable in english;
2025-08-06 10:45:37 +02:00
37b67641ef
Merge branch 'feature-40128/Mehrere_Suchergebnisse_für_selbe_Person' into rc1_FHC4_C4
2025-08-01 16:19:23 +02:00
66caf47d98
Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4
2025-08-01 15:54:22 +02:00
1cb637cb7f
Tab Betriebsmittel: change type kaution to text, edit validations and add translations
2025-08-01 10:55:11 +02:00
913b218fca
phrasenupdate Stundenplan -> LV-Plan; tooltip update/remove;
2025-08-01 10:53:15 +02:00
e58bf3a8cf
WIP noten/pruefung import
2025-08-01 09:48:46 +02:00
9c1eb35e88
Tab Contact: Phrase for Validation Length PLZ
2025-07-31 11:18:37 +02:00
Alexei Karpenko