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 |
|
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 |
|
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 |
|
Harald Bamberger
|
b0fc5a3618
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-22 10:37:30 +02:00 |
|
Harald Bamberger
|
b0f90cafb6
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-22 10:36:54 +02:00 |
|
Harald Bamberger
|
c0c57ba378
|
remove irregular files
|
2026-05-22 10:36:28 +02:00 |
|
Harald Bamberger
|
6e599908cd
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 17:30:14 +02:00 |
|
Harald Bamberger
|
c099eec7a7
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-19 17:29:52 +02:00 |
|
Harald Bamberger
|
0962e62e69
|
Merge branch 'feature-76202/HorizontalSplit_from_master' into studvw_2026_05_rc
|
2026-05-19 17:28:08 +02:00 |
|
Harald Bamberger
|
dcd6cfd74b
|
increase width of horizontal split
|
2026-05-19 17:26:46 +02:00 |
|
Harald Bamberger
|
b1be5a4ba4
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 17:12:55 +02:00 |
|
Harald Bamberger
|
5caab182b2
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-19 17:12:37 +02:00 |
|
Harald Bamberger
|
baaf941f25
|
Merge branch 'feature-75958/StudVW_DatenExport_wie_im_Fas' into studvw_2026_05_rc
|
2026-05-19 17:12:11 +02:00 |
|
Harald Bamberger
|
2e5e7afb4d
|
slot end tag
|
2026-05-19 17:11:51 +02:00 |
|
Harald Bamberger
|
71f68da90b
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 16:52:36 +02:00 |
|
Harald Bamberger
|
2c4626fd1a
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-19 16:52:14 +02:00 |
|
Harald Bamberger
|
178638c006
|
Merge branch 'feature-75958/StudVW_DatenExport_wie_im_Fas' into studvw_2026_05_rc
|
2026-05-19 16:51:57 +02:00 |
|
Harald Bamberger
|
981c97173e
|
add padding to export icon link
|
2026-05-19 16:51:24 +02:00 |
|
Harald Bamberger
|
c11fd03362
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 16:42:43 +02:00 |
|
Harald Bamberger
|
49d5c46133
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-19 16:42:25 +02:00 |
|
Harald Bamberger
|
9fb00f6cbd
|
remove orphaned end tag, add right padding
|
2026-05-19 16:40:18 +02:00 |
|
Harald Bamberger
|
ec1422a136
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-19 16:18:06 +02:00 |
|
Harald Bamberger
|
d56d1bc2bd
|
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
|
2026-05-19 16:17:35 +02:00 |
|
Harald Bamberger
|
45eca862ac
|
use table alias
|
2026-05-19 16:17:14 +02:00 |
|
Harald Bamberger
|
89e98056e6
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-19 16:12:31 +02:00 |
|
Harald Bamberger
|
9f738f4871
|
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
|
2026-05-19 16:11:37 +02:00 |
|
Harald Bamberger
|
3533a3fd4b
|
add missing comma
|
2026-05-19 16:11:08 +02:00 |
|
Harald Bamberger
|
5cf14aa886
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 10:28:32 +02:00 |
|
Harald Bamberger
|
7d3096c2e8
|
readd required assignments for tags removed during merge
|
2026-05-19 10:28:08 +02:00 |
|
Harald Bamberger
|
ef2f9630a9
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-19 10:22:28 +02:00 |
|
Harald Bamberger
|
4d3c73c78f
|
add join condition for notizzuordung via prestudent_id only
|
2026-05-19 10:21:56 +02:00 |
|
Harald Bamberger
|
9ee6a0a01a
|
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
|
2026-05-19 09:51:42 +02:00 |
|
Harald Bamberger
|
1e226f4515
|
Merge branch 'master' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:36 +02:00 |
|
Harald Bamberger
|
ca8fe5bd19
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:06 +02:00 |
|
Harald Bamberger
|
6d26ec2ab7
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-18 16:51:33 +02:00 |
|