 ma0048
|
027be3e30e
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
# Conflicts:
# public/js/components/Tag/Tag.js
|
2025-09-03 10:51:56 +02:00 |
|
|
ma0048
|
396251b061
|
lvverwaltung einschraenkung bei den tags
erledigte tags werden in der header suche nicht beruecksichtigt
|
2025-09-02 13:35:15 +02:00 |
|
|
ma0048
|
3bdac887bf
|
Merge branch 'refs/heads/feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
|
2025-08-27 09:53:25 +02:00 |
|
|
ma0048
|
7e6643c0ff
|
phrase typo
|
2025-08-27 09:51:34 +02:00 |
|
|
ma0048
|
81bf016945
|
phrasesupdate
|
2025-08-27 09:43:27 +02:00 |
|
|
ma0048
|
1167251bdc
|
Merge branch 'refs/heads/feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/person/Notiz_model.php
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-08-27 09:29:50 +02:00 |
|
|
ma0048
|
407f62976c
|
Merge branch 'refs/heads/feature-63364/pep_self_overview' into demo
|
2025-08-27 09:23:36 +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 |
|
|
Andreas Österreicher
|
e366556992
|
Dienstverhinderung für Volksschultag hinzugefügt
|
2025-08-26 16:05:06 +02:00 |
|
|
Andreas Österreicher
|
d8eac58ab1
|
Merge branch 'feature-61672/svnr_aus_infocenter_tool_entfernen'
|
2025-08-26 08:45:05 +02:00 |
|
|
Andreas Österreicher
|
c6d04c7490
|
Merge branch 'master' into feature-61672/svnr_aus_infocenter_tool_entfernen
|
2025-08-26 08:43:22 +02:00 |
|
|
Andreas Österreicher
|
866d95c4b8
|
Merge branch 'feature-62681/mc1_vorlage_v2025_07'
|
2025-08-25 14:12:54 +02:00 |
|
|
Andreas Österreicher
|
1025a8b461
|
Removed Duplicate Phrase
|
2025-08-25 11:19:20 +02:00 |
|
|
Andreas Österreicher
|
67290a5af8
|
Merge branch 'feature-61592/AnwesenheitenFinetuning'
|
2025-08-25 11:10:34 +02:00 |
|
|
Harald Bamberger
|
ad83228396
|
do not terminatewithsuccess in function called in db transaction because this results in the transaction being rollbacked
|
2025-08-19 17:34:23 +02:00 |
|
|
Harald Bamberger
|
905a2dadff
|
terminate with error if receiver person_id or prestudent_id is not found
|
2025-08-19 17:18:57 +02:00 |
|
|
Harald Bamberger
|
1c86a6ad55
|
add validation callback wrapper method
|
2025-08-19 16:05:47 +02:00 |
|
|
Harald Bamberger
|
a482016dee
|
modal-dialog-scrollable
|
2025-08-19 13:58:41 +02:00 |
|
|
Harald Bamberger
|
2198ea95e4
|
use form.post instead of form.send since latter expects a promise
|
2025-08-19 13:51:09 +02:00 |
|
|
Harald Bamberger
|
ef80a19a24
|
allow negative studiengang_kz in prestudent and orgform urls
|
2025-08-19 13:22:59 +02:00 |
|
|
Johann Hoffmann
|
c5001f87bd
|
modal header flex container for buttons (close, expand);
|
2025-08-19 11:03:23 +02:00 |
|
|
Harald Bamberger
|
ba7f59de24
|
Merge branch 'bug-63358/CIS4_Kalendar_Widget_Deutsch_English_Tagesname_schalten_nicht_um'
|
2025-08-19 10:56:34 +02:00 |
|
|
ma0048
|
d8d9521c9c
|
pep self overview hinzugefuegt
tag readonly modus
|
2025-08-19 10:49:21 +02:00 |
|
|
Johann Hoffmann
|
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 |
|
|
chfhtw
|
f50171ad9a
|
Calender: track locale change for day & list mode
|
2025-08-18 15:38:35 +02:00 |
|
|
Harald Bamberger
|
6d7429eb8e
|
Merge branch 'feature-62779/xul_abloese_haustechnik_schluesselverwaltung'
|
2025-08-14 18:10:36 +02:00 |
|
|
Harald Bamberger
|
b9e3c47be9
|
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
|
2025-08-14 18:03:36 +02:00 |
|
|
Harald Bamberger
|
5119858c12
|
Merge branch 'feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen'
|
2025-08-14 17:52:47 +02:00 |
|
|
Harald Bamberger
|
ed00c8d0ae
|
add permission for new function in Core_Notizcontroller to NotizPerson Controller
|
2025-08-14 16:45:52 +02:00 |
|
|
Harald Bamberger
|
83d98c258e
|
stv Notiz Controller add permission for new function getCountNotes
|
2025-08-14 16:36:00 +02:00 |
|
|
Harald Bamberger
|
aaf9e8c885
|
revert to popupModal to stay consistent with other stv tabs
|
2025-08-14 16:16:53 +02:00 |
|
|
Harald Bamberger
|
aa3e1ad1d1
|
Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen
|
2025-08-14 15:24:42 +02:00 |
|
|
Harald Bamberger
|
1092463beb
|
show count of notes in tab title
|
2025-08-14 15:23:42 +02:00 |
|
|
Harald Bamberger
|
33fbbde99f
|
Merge branch 'master' into feature-63411/Notizen_Anzahl_im_Tab_Header_anzeigen
|
2025-08-14 12:32:07 +02:00 |
|
|
Harald Bamberger
|
79506319a0
|
Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
|
2025-08-14 12:31:47 +02:00 |
|
|
Harald Bamberger
|
a51f587da7
|
match negative studiengang_kz explicitly
|
2025-08-14 10:29:16 +02:00 |
|
|
Harald Bamberger
|
e11ff91b53
|
use (:any) for studiengang_kz since it can be negative
|
2025-08-13 18:45:58 +02:00 |
|
|
Harald Bamberger
|
d4f5a7c92f
|
add missing helper js file
|
2025-08-13 16:37:28 +02:00 |
|
|
Harald Bamberger
|
50b2334e5c
|
work in progess, calc tabs title suffix when component is not rendered
|
2025-08-13 10:38:30 +02:00 |
|
|
Harald Bamberger
|
e7f58ca1ba
|
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
|
2025-08-13 07:33:13 +02:00 |
|
|
Harald Bamberger
|
3749955d5b
|
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
|
2025-08-13 07:03:59 +02:00 |
|
|
Harald Bamberger
|
2402693116
|
Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
|
2025-08-12 09:07:19 +02:00 |
|
|
Harald Bamberger
|
5e7514ffff
|
Merge branch 'feature-63400/studentenverwaltung_phrases'
|
2025-08-12 09:02:40 +02:00 |
|
|
ma0048
|
57bc4d7b92
|
load phraseslib in students
|
2025-08-12 08:51:55 +02:00 |
|
|
Harald Bamberger
|
80f1edca8f
|
Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
|
2025-08-11 15:25:16 +02:00 |
|
|
chfhtw
|
3fad0fd69a
|
CSS fix primevue/bootstrap box-sizing
|
2025-08-11 13:00:26 +02:00 |
|
|
Harald Bamberger
|
c8c3361783
|
use getAktOrNextSemester instead of getNearest to use next semester in summer
|
2025-08-11 11:26:01 +02:00 |
|
|
ma0068
|
c109d84492
|
Tab Details: bugfix: show Zugangscode
|
2025-08-11 10:13:42 +02:00 |
|
|
ma0048
|
9ae78f2de6
|
master gemerged
|
2025-08-11 09:23:18 +02:00 |
|
|
chfhtw
|
f6432cdcd0
|
accummulate multiple setFeedback calls in Form/Valdation
|
2025-08-08 12:26:51 +02:00 |
|