 Harald Bamberger
|
5694ba7325
|
Merge branch 'master' into 77804-exclude-moodle-from-other-lv-plan
|
2026-07-08 14:45:15 +02:00 |
|
|
Harald Bamberger
|
bbec7de8de
|
Merge branch 'master' of github.com:FH-Complete/FHC-Core
|
2026-07-08 14:38:42 +02:00 |
|
|
Harald Bamberger
|
1d14e58d8f
|
use current gender form
|
2026-07-08 14:33:02 +02:00 |
|
|
Harald Bamberger
|
db2beeb51f
|
Merge branch 'feature/76981-missing-mailing-lists'
|
2026-07-08 14:24:13 +02:00 |
|
|
Harald Bamberger
|
e4f43cc820
|
Merge branch 'master' into feature/76981-missing-mailing-lists
|
2026-07-08 14:15:40 +02:00 |
|
|
adisposkofh
|
8adc1c8bcc
|
not showing moodle events in other users' lv plans
|
2026-07-08 11:41:58 +02:00 |
|
|
Harald Bamberger
|
fe195f4080
|
Cis App: define isMobile local since it is used in handleClick event handler
|
2026-07-08 10:53:40 +02:00 |
|
|
Harald Bamberger
|
c69bb9ccaa
|
Merge branch 'cis40_2026-02_rc_abgabetool_finetuning_76688'
|
2026-07-08 09:39:44 +02:00 |
|
|
Harald Bamberger
|
4889299dd9
|
remove unused file components/Cis/LvPlan/StgOrg_DEPR.js
|
2026-07-08 09:20:51 +02:00 |
|
|
Harald Bamberger
|
8f427344d0
|
remove currently unused package-lock.json
|
2026-07-08 09:15:25 +02:00 |
|
|
Harald Bamberger
|
0d6867799c
|
projektbetreuer tabulator select max 1 row
|
2026-07-08 09:06:14 +02:00 |
|
|
Harald Bamberger
|
5602c7091a
|
Merge branch 'feature/76688-general-tabulator-issues_76776-localization' into cis40_2026-02_rc_abgabetool_finetuning_76688
|
2026-07-08 07:17:24 +02:00 |
|
|
Andreas Österreicher
|
6a16fb7515
|
Betreuerart wird Übergeben damit Zweitbetreuer keine Termine erstellen können
|
2026-07-07 14:33:29 +02:00 |
|
|
Andreas Österreicher
|
33b05e9df5
|
Abfrage für PersonID entfernt da sonst Zweitbetreuer/Erstbetreuer nicht geladen werden
|
2026-07-07 14:10:55 +02:00 |
|
|
Harald Bamberger
|
ac2a1147cc
|
do not show download links in OtherLvPlan and StgOrg LvPlan mode
|
2026-07-07 11:44:04 +02:00 |
|
|
Harald Bamberger
|
8d7fdb0254
|
Merge branch 'master' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-07-07 11:15:53 +02:00 |
|
|
Harald Bamberger
|
0fd938e85c
|
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
|
2026-07-07 11:08:19 +02:00 |
|
|
Johann Hoffmann
|
b57fe4839b
|
update tooltip phrase + keyversion
|
2026-07-06 15:15:02 +02:00 |
|
|
Harald Bamberger
|
044e29f557
|
Merge branch 'feature-77662/Absolventen_Zugriff_CIS4'
|
2026-07-01 14:47:52 +02:00 |
|
|
Harald Bamberger
|
f5cdb0a2fb
|
add configs to define grace period and roles, add logic to benutzerberechtigungs class
|
2026-07-01 12:10:06 +02:00 |
|
|
Johann Hoffmann
|
d405296a14
|
also show email contact for zweitbetreuer in student page + distinguish them in the label in case of more than 1 betreuer;
|
2026-06-30 13:02:19 +02:00 |
|
|
Johann Hoffmann
|
787e5d0ee4
|
usage of $p.t('abgabetool/c4paatyp' + typKurzbz) instead of raw bezeichnung for abgabetyp in abgabeterminFormatter for nextTermin/prevTermin cells; added phrasen from feature-77384/ZweitbegutachterSpeichernFix branch;
|
2026-06-30 11:57:48 +02:00 |
|
|
Johann Hoffmann
|
6264006728
|
flat table selectAll Handler fix; call checkZuordnung just how we thoughtcrimed it in feature-76667/ProjektarbeitUploadZuordnungErrorMessage
|
2026-06-29 14:30:41 +02:00 |
|
|
Johann Hoffmann
|
0007460428
|
phrasen archaeology; selectionCheckFlat on flatTable;
|
2026-06-29 13:58:02 +02:00 |
|
|
Andreas Österreicher
|
8cc0462712
|
Merge branch 'bug-76560/Download_Notenlisten_einschraenken'
|
2026-06-29 13:33:04 +02:00 |
|
|
Paolo
|
4162305ac6
|
Improved the permissions check in the cis/private/lehre/notenliste.xls.php
|
2026-06-29 13:28:57 +02:00 |
|
|
Johann Hoffmann
|
8abb028f55
|
Merge branch 'feature-76667/ProjektarbeitUploadZuordnungErrorMessage' into cis40_2026-02_rc_abgabetool_finetuning
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
|
2026-06-29 13:21:14 +02:00 |
|
|
Johann Hoffmann
|
48798a9cee
|
zusatzdaten added to new getMitarbeiterProjektarbeiten implementation; fix assignment of noteBackend variable -> needed for benotet headers; WIP phrasen archeology
|
2026-06-29 13:07:11 +02:00 |
|
|
Paolo
|
6508301526
|
Merge branch 'master' into bug-76560/Download_Notenlisten_einschraenken
|
2026-06-29 09:32:53 +02:00 |
|
|
Harald Bamberger
|
a8f472ca6c
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-26 15:18:42 +02:00 |
|
|
Harald Bamberger
|
138c80c97a
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-26 15:15:47 +02:00 |
|
|
Harald Bamberger
|
97a88d1d0d
|
Merge branch 'feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren'
|
2026-06-26 15:07:04 +02:00 |
|
|
Harald Bamberger
|
a23d079001
|
Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren
|
2026-06-26 14:07:14 +02:00 |
|
|
Harald Bamberger
|
f13f6ff0cc
|
Merge branch 'feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren'
|
2026-06-26 13:40:17 +02:00 |
|
|
Harald Bamberger
|
a595daa9b4
|
Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren
|
2026-06-26 11:50:12 +02:00 |
|
|
Johann Hoffmann
|
3094772150
|
also added missing erstbetreuer arten to getProjektbetreuerEmail
|
2026-06-22 13:56:36 +02:00 |
|
|
Johann Hoffmann
|
f0afcdd1c5
|
getMitarbeiterProjektarbeiten CTE primary_betreuer added missing Betreuerarten "Begutachter" and "Betreuer" aswell as where clause on person_id to avoid selecting every betreuer; import the correct dateFilter Headerfilter so manual input is working as intended;
|
2026-06-22 13:48:41 +02:00 |
|
|
Johann Hoffmann
|
70368525e0
|
readded phrasen that went missing in https://github.com/FH-Complete/FHC-Core/commit/22eed92c86925101a9445c1bfbe4bf5037b9a114
|
2026-06-22 11:47:38 +02:00 |
|
|
Johann Hoffmann
|
715c9f77b8
|
added missing config BETREUER_SAMMELMAIL_BUTTON_STUDENT in getConfig Api Call; removed duplicate uid data field resulting from merge;
|
2026-06-22 11:17:14 +02:00 |
|
|
Harald Bamberger
|
3401afed94
|
remove duplicate import of ApiAuthinfo and call to ApiAuthinfo.getAuthUID
|
2026-06-22 09:47:24 +02:00 |
|
|
Harald Bamberger
|
464cfb9efc
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-19 10:23:17 +02:00 |
|
|
Harald Bamberger
|
e3aa36cae0
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-19 10:22:49 +02:00 |
|
|
Andreas Österreicher
|
0a232828c8
|
Merge branch 'feature-71619/Notenspiegel_ECTS_Summe'
|
2026-06-19 08:31:08 +02:00 |
|
|
Harald Bamberger
|
90b8788c93
|
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-18 14:46:05 +02:00 |
|
|
Harald Bamberger
|
c125130dcb
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-18 14:38:42 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Harald Bamberger
|
0687ef72ce
|
Merge branch 'bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert'
|
2026-06-17 09:40:23 +02:00 |
|
|
Johann Hoffmann
|
2170d3e14a
|
numeric notensort in all tables; changed stv projektarbeit getNoten to only fetch active ones so stv and abgabetool use the same set of grades;
|
2026-06-16 15:17:40 +02:00 |
|
|
Harald Bamberger
|
9180b9bd63
|
Merge branch 'master' into bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert
|
2026-06-16 13:11:40 +02:00 |
|
|
Johann Hoffmann
|
2b06de8ecb
|
Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
|
2026-06-16 11:59:53 +02:00 |
|