da725e3ab1
Merge branch 'feature-63444/stv_mehrfachaktion_mail_an_private_oder_interne_adresse' into demo-cis40
2025-09-29 17:40:26 +02:00
76e6874a1a
Merge branch 'master' into feature-63444/stv_mehrfachaktion_mail_an_private_oder_interne_adresse
2025-09-29 17:33:23 +02:00
edd34941cc
Merge branch 'feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren' into demo-cis40
2025-09-29 16:57:10 +02:00
4fa2de5105
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-09-29 15:37:42 +02:00
c65686ef42
Merge branch 'feature-63373/FHC4_Studierendenverwaltung_Dokumente_erstellen' into demo-cis40
2025-09-29 13:53:30 +02:00
5c66dfad49
Merge branch 'master' into feature-63373/FHC4_Studierendenverwaltung_Dokumente_erstellen
2025-09-29 08:24:18 +02:00
c7729f85df
Merge branch 'master' into demo-cis40
2025-09-29 08:09:33 +02:00
a021c85920
schönere phrasen
2025-09-25 17:23:03 +02:00
58b942f044
fix typo in template_kurzbz
2025-09-25 16:14:09 +02:00
3f0f48a4e0
Student.php: bracket bugfix, return person id of added Personinstead of true, Studierendenverwaltung Projektarbeit phrases
2025-09-22 17:34:50 +02:00
eaec76c3d2
Merge branch 'master' into feature-63437/cis4_iframe_component
2025-09-22 17:03:42 +02:00
8e7a1a2ddd
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-09-22 13:39:36 +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
53b187c9b6
Merge branch 'feature-63435/Studierendenverwaltung_Studierende_Verbandsgruppen_und_Spezialgruppen_zuordnen_Multiaktion' into demo-cis40
2025-09-18 07:23:43 +02:00
8bc17eded5
Merge branch 'master' into demo-cis40
2025-09-18 07:17:28 +02:00
e80cfc207e
Merge branch 'feature-63370/AnwesenheitenMicrotuning'
2025-09-17 14:59:49 +02:00
091ed0dacd
Merge branch 'master' into demo-cis40
2025-09-17 14:16:05 +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
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
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
34528bb014
iframe content hinzugefuegt
2025-08-29 13:19:00 +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
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
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
274fa63658
Merge branch 'feature-62779/xul_abloese_haustechnik_schluesselverwaltung' into demo-cis40
2025-08-13 07:34:45 +02:00
e7f58ca1ba
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
2025-08-13 07:33:13 +02:00
81b2ed6551
Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into demo-cis40
2025-08-13 07:05:21 +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
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
Harald Bamberger