Commit Graph

429 Commits

Author SHA1 Message Date
Harald Bamberger d42157c5f8 Merge branch 'cis40_2026-05_ma_rc' into demo-cis40 2026-05-06 18:19:53 +02:00
Harald Bamberger cb744799bd Merge branch 'feature-71776/StudVW_Abschlusspruefung_DropdownsPrueferAndMultiActionNewPruefung' into studvw_2026_05_rc 2026-05-06 17:27:26 +02:00
Harald Bamberger 90ebee25fe Merge branch 'feature-71775/StudVW_ChangeSem_Behaviour' into studvw_2026_05_rc 2026-05-06 16:28:44 +02:00
Harald Bamberger 66c0c14748 Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc 2026-05-05 08:53:34 +02:00
Harald Bamberger 453fc209b8 Merge branch 'master' into cis40_2026-02_rc 2026-05-05 08:53:07 +02:00
Harald Bamberger cffa493984 Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc 2026-05-04 18:17:53 +02:00
Harald Bamberger 9030cdcc76 Merge branch 'feature-70747/Zeitsperren_auf_VueJs_Portieren' into cis40_2026-05_ma_rc 2026-05-04 18:06:21 +02:00
Harald Bamberger c3ef487a6f Merge branch 'feature-76148/MyLvaMA' into cis40_2026-05_ma_rc 2026-05-04 17:59:51 +02:00
Harald Bamberger e373e797f4 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc 2026-05-04 17:01:44 +02:00
Harald Bamberger 382244035b Merge branch 'feature-68610/CIS4_Projektabgabe' into cis40_2026-05_ma_rc 2026-05-04 16:09:33 +02:00
Harald Bamberger cb60ddcc94 Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle 2026-05-04 15:41:52 +02:00
Harald Bamberger bd4ced9559 bugfix: comma as decimal separator prevents saving booking, bugfix messages tinymce not resizeable 2026-05-04 14:39:19 +02:00
Harald Bamberger 2227c3ecf1 Merge branch 'feature-76671/moving-avg-grade-calc-to-backend' into cis40_2026-02_rc 2026-04-30 07:33:42 +02:00
chfhtw dfe05cbfa8 make tagsArrayAC a computed and rename it to availableTags 2026-04-27 10:03:36 +02:00
chfhtw 5798e960a2 Use config update for widgets as intended instead of a proprietary solution 2026-04-27 09:37:17 +02:00
adisposkofh f780553773 moved avg grade calcs to backend 2026-04-24 15:55:03 +02:00
Harald Bamberger 1dd9ff0daf Merge branch 'feature-76385/mobile-optimization-lv-plan' into cis40_2026-02_rc 2026-04-23 16:33:24 +02:00
Harald Bamberger ff876afbb3 Merge branch 'feature-76464/reworking-use-of-controller-viewdata' into cis40_2026-02_rc 2026-04-23 14:20:19 +02:00
adisposkofh 2eb58e3346 reworked how 'compactible event types' are defined 2026-04-23 11:43:25 +02:00
Harald Bamberger 2c1702a20b Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc 2026-04-23 11:19:17 +02:00
Harald Bamberger d14b9e2ab5 Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc 2026-04-20 18:02:23 +02:00
Harald Bamberger d926e4165b Merge branch 'master' into cis40_2026-02_rc 2026-04-20 17:52:24 +02:00
Harald Bamberger c53d451000 Merge branch 'master' into feature-68301/cis4_ma_raumreservierung 2026-04-20 16:34:30 +02:00
Harald Bamberger f6747713a1 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4 2026-04-20 11:13:14 +02:00
Johann Hoffmann ccd8d5f871 WIP alternative table representation of Cis4 MyLv page for teachers assigned to a lot of different degree programs -> cards layout would result in a lot of fluff & scroll; finalized getMultipleLvMenu() functionality in LvMenu.php controller to avoid http request overhead; deleted phrasen mixin from old components since this is a plugin bound to the apps globalConfigince some time already; Allow to switch layout similar to calendar modes -> need to further adapt old component structure to resuse lvmenu data 2026-04-20 10:28:49 +02:00
Harald Bamberger e90019cdd8 Merge branch 'master' into feature-68610/CIS4_Projektabgabe 2026-04-20 09:30:54 +02:00
Harald Bamberger 1c2491385f Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags 2026-04-17 10:38:00 +02:00
adisposkofh 94f742187e Merge branch 'feature-76150/CIS4-LV-Plan-von-anderen-Personen-anzeigen' into feature-76464/reworking-use-of-controller-viewdata 2026-04-16 16:12:33 +02:00
adisposkofh 70ebe34f1f merge develop into -- manual conflict resolution 2026-04-16 16:09:03 +02:00
adisposkofh 917a9ee707 minor fix 2026-04-16 15:55:43 +02:00
adisposkofh 2aecc6e0f2 removed use of viewData object as passed by controller thru routerview to component -- component fetches data instead 2026-04-16 15:49:16 +02:00
Harald Bamberger f121f9b5a2 deactivate pagination - since potentially msg threads are not shown completely 2026-04-16 11:23:57 +02:00
adisposkofh 7daaf79fcc implemented permission for viewing other users' lv plans 2026-04-13 15:44:09 +02:00
adisposkofh f1c3c8296f implemented 'OtherLvPlan' to view other users' timetables 2026-04-13 10:41:41 +02:00
chfhtw f06e59b362 Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe 2026-04-08 14:13:02 +02:00
chfhtw 1951cd6fa8 split/rename dashboard api factories 2026-03-24 16:08:02 +01:00
chfhtw aeb5d40840 rename api endpoints 2026-03-24 15:14:39 +01:00
chfhtw 2fc392c084 refactor dashboards Preset->addWidgets to (single) Preset->addWidget 2026-03-23 16:05:22 +01:00
chfhtw 9cff50fa3b extract preset logic from dashboard admin api 2026-03-23 15:44:42 +01:00
chfhtw 1972b461e7 replace controllers/dashboard/Config.php with controllers/api/frontend/v1/dashboard/User.php & controllers/api/frontend/v1/dashboard/DashboardAdmin.php 2026-03-23 11:21:15 +01:00
chfhtw e957926a4d replace controllers/dashboard/Widget.php with controllers/api/frontend/v1/dashboard/Widget.php 2026-03-23 10:57:43 +01:00
Harald Bamberger 14a8e2f001 Funktionen fett schreiben, die schon presets hinterlegt haben, demo aus views und Controller namen entfernen, preview hinzufuegen 2026-03-18 15:48:57 +01:00
Harald Bamberger 7c1762d467 Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin 2026-03-18 09:20:53 +01:00
ma0068 2682ea75ab use only one endpoint for detailheader 2026-03-12 16:58:48 +01:00
Harald Bamberger 37a79c4589 Merge branch 'master' into feature-71775/StudVW_ChangeSem_Behaviour 2026-03-12 15:03:28 +01:00
ma0068 2237e9f1b7 refactor detail Header, relaod array if semester changed, show no status if no status, phrase 2026-03-09 11:42:24 +01:00
Johann Hoffmann 2dd732b924 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/views/CisRouterView/CisRouterView.php
2026-02-27 10:38:24 +01:00
ma0068 c127c0900e refactor dropdown for pruefer, add localStorage for formVariables, add multiactions for adding new finalexam 2026-02-25 14:28:41 +01:00
ma0068 dc642cfbe7 merge master into cis40_2026-02-rc 2026-02-19 16:44:01 +01:00
Harald Bamberger 006393704c Merge branch 'master' into vv_und_studvw_2026_02_rc4 2026-02-17 12:17:15 +01:00