 Harald Bamberger
|
da3b329772
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-06-24 15:42:16 +02:00 |
|
|
Harald Bamberger
|
7f9dcc43ad
|
add Compat iframe controller and component
|
2026-06-24 15:41:47 +02:00 |
|
|
Harald Bamberger
|
274262262a
|
iframe_content: only replace ../ to be able to use index.ci.php in menu entry
|
2026-06-24 15:35:31 +02:00 |
|
|
Harald Bamberger
|
41d40102f3
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-06-22 15:26:48 +02:00 |
|
|
Harald Bamberger
|
95e63f865c
|
add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php
|
2026-06-22 15:25:51 +02:00 |
|
|
Harald Bamberger
|
1496045c40
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-06-18 13:46:21 +02:00 |
|
|
Harald Bamberger
|
e2dadcd208
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-06-18 13:23:49 +02:00 |
|
|
Harald Bamberger
|
164c11e10a
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-06-18 13:20:25 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Harald Bamberger
|
c7bac03429
|
concat escaped string correct
|
2026-06-17 17:45:18 +02:00 |
|
|
Harald Bamberger
|
07d3b32279
|
fix typo
|
2026-06-17 17:23:05 +02:00 |
|
|
Harald Bamberger
|
245d0d3369
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-06-17 17:15:37 +02:00 |
|
|
Harald Bamberger
|
d3d04c5a77
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-06-17 14:44:25 +02:00 |
|
|
Harald Bamberger
|
0687ef72ce
|
Merge branch 'bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert'
|
2026-06-17 09:40:23 +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 |
|
|
Harald Bamberger
|
070ac1e878
|
override permission for all methods not only the overwritten ones
|
2026-06-15 14:37:43 +02:00 |
|
|
Andreas Österreicher
|
168fb00023
|
Merge branch 'feature-40852/MasterLehrgaenge_BeruflicheKompetenzen'
|
2026-06-15 09:18:17 +02:00 |
|
|
chfhtw
|
f5d81e4a93
|
move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query
|
2026-06-12 09:53:59 +02:00 |
|
|
Andreas Österreicher
|
b0f3fa0c46
|
Berufliche Qualifikation umbenannt
|
2026-06-12 09:41:34 +02:00 |
|
|
Andreas Österreicher
|
6d89e95afa
|
Merge branch 'master' into feature-40852/MasterLehrgaenge_BeruflicheKompetenzen
|
2026-06-12 08:53:44 +02:00 |
|
|
adisposkofh
|
f45782aeef
|
removed redundant console log
|
2026-06-02 12:49:11 +02:00 |
|
|
adisposkofh
|
c2faff5a03
|
minor fix
|
2026-06-02 11:52:13 +02:00 |
|
|
adisposkofh
|
1cff18112b
|
removed auto-ban on sunday room reservations
|
2026-06-02 11:09:13 +02:00 |
|
|
adisposkofh
|
195b99e588
|
minor fix re: calendar event timeslot display
|
2026-06-01 13:52:54 +02:00 |
|
|
Andreas Österreicher
|
2f90112e4d
|
Merge branch 'rc_reihungstest'
|
2026-06-01 10:58:33 +02:00 |
|
|
Andreas Österreicher
|
774eb90bcc
|
Merge branch 'feature-76918/reihungstest_gebiete_nur_von_abegschickten_studiengaengen' into rc_reihungstest
|
2026-06-01 09:46:12 +02:00 |
|
|
Andreas Österreicher
|
1def930147
|
Merge branch 'feature-76920/reihungstest_fertig_nachricht_anzeigen_wenn_alle_gebiete_abgeschlossen_wurden' into rc_reihungstest
|
2026-06-01 09:11:02 +02:00 |
|
|
Andreas Österreicher
|
30b8a406a5
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
|
2026-06-01 09:10:35 +02:00 |
|
|
Andreas Österreicher
|
093842274e
|
Merge branch 'feature-75887/reihungstest_constructor_popups' into rc_reihungstest
|
2026-06-01 09:05:22 +02:00 |
|
|
Harald Bamberger
|
63ff8dd4c4
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-29 13:40:02 +02:00 |
|
|
Harald Bamberger
|
6019489ef1
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-29 13:38:58 +02:00 |
|
|
adisposkofh
|
fc79f92796
|
added 'add reservation'/'reservation not allowed' tooltips in calendar
|
2026-05-27 15:35:45 +02:00 |
|
|
ma0048
|
fd2f4187fa
|
wording angepasst
|
2026-05-27 12:34:04 +02:00 |
|
|
adisposkofh
|
8e569a9ccd
|
displaying forbidden room reservation slots
|
2026-05-27 10:43:28 +02:00 |
|
|
adisposkofh
|
d7b2964e4e
|
obsolete use of viewData object from cisRouterView
|
2026-05-26 17:33:38 +02:00 |
|
|
ma0048
|
b2bebb7fa3
|
alle gebiete wurden gestartet meldung
|
2026-05-26 13:32:21 +02:00 |
|
|
ma0048
|
e32cce57fe
|
gebiete nur von abgeschickten stg
|
2026-05-26 13:26:16 +02:00 |
|
|
adisposkofh
|
fa91e204f0
|
always displaying timeslot on calendar event in list view
|
2026-05-26 12:02:08 +02:00 |
|
|
Harald Bamberger
|
366edb7e90
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-26 11:01:57 +02:00 |
|
|
Harald Bamberger
|
ac6aa28680
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 11:01:39 +02:00 |
|
|
ma0068
|
f6f58642f5
|
update second occurence of id STORAGE_KEY
|
2026-05-26 10:57:26 +02:00 |
|
|
Harald Bamberger
|
9430135592
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-26 09:40:11 +02:00 |
|
|
Harald Bamberger
|
57eec98604
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 09:38:06 +02:00 |
|
|
Harald Bamberger
|
1561aa55b7
|
correct model path
|
2026-05-26 09:37:49 +02:00 |
|
|
adisposkofh
|
23506430b1
|
initializing stg org lv plan with provided url params
|
2026-05-26 09:30:50 +02:00 |
|
|
adisposkofh
|
fa58635a22
|
positioning of profile cards 'quick links' and 'calendar sync'
|
2026-05-26 09:29:10 +02:00 |
|
|
Harald Bamberger
|
35f4d23308
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 09:28:40 +02:00 |
|
|
Harald Bamberger
|
199b62d13f
|
Merge branch 'studvw_2026_05_rc' into demo-cis40
|
2026-05-26 09:07:04 +02:00 |
|
|
Harald Bamberger
|
bb366e4117
|
font color black on tag limette
|
2026-05-26 09:06:44 +02:00 |
|
|
Harald Bamberger
|
7f630f24d5
|
StundenplanLib: check array index access before
|
2026-05-26 07:54:41 +02:00 |
|