Commit Graph
627 Commits
Author SHA1 Message Date
Harald Bamberger ca4043833e Merge branch 'master' into cis40_2026-09_ma_rc 2026-10-05 18:04:32 +02:00
Harald Bamberger 643929a0c6 add cis4 class to body to make it harder for cms content style sheets to override padding, add names to calendar events renderer components, show lvmenu not only for route MyLvPlan but e.g. also in Dashboard LvPlan Widget 2026-10-05 17:56:57 +02:00
Harald Bamberger 5aa007f49c Merge branch 'master' into cis40_2026-09_ma_rc 2026-10-01 12:43:17 +02:00
Harald Bamberger f3d031ab16 cismenu: add cis-main-menu class to main nav, add li elements to ul, style cis-main-menu ul and li to prevent interferec with cms content styles, add draggable false to cis menu entries to improve menu scrolling especially on mobile devices 2026-10-01 11:48:51 +02:00
Harald Bamberger 1d838f8116 Merge branch 'cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09' into cis40_2026-09_ma_rc 2026-09-29 14:59:00 +02:00
Harald Bamberger 9605227139 Merge branch 'master' into cis40_2026-09_ma_rc 2026-09-29 14:58:05 +02:00
adisposkofh a64219dd25 range lv plan print css mod 2026-09-29 14:50:11 +02:00
adisposkofh e06d5fbdc1 minor range lv plan print fix 2026-09-29 13:22:48 +02:00
adisposkofh d30595bbfb reworked degree program contact persons collapsible 2026-09-29 09:59:13 +02:00
adisposkofh eebe2d6aec code formatting 2026-09-28 17:05:07 +02:00
adisposkofh 9ae2c91677 reworked degree program contact persons collapsible 2026-09-28 15:34:23 +02:00
adisposkofh 0279813ba9 sticky first column in zeitsperrenma table 2026-09-24 16:33:42 +02:00
adisposkofh eb164f5f69 added range view to other lv plan 2026-09-23 15:17:37 +02:00
adisposkofh a4f8154662 merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-22 13:43:25 +02:00
adisposkofh 33d3983a97 fhc calendar range view print fix 2026-09-22 13:39:24 +02:00
adisposkofh a9f84eda42 fhc calendar range view print fix 2026-09-22 11:36:06 +02:00
adisposkofh 3f3e94bdc9 reworked fhc calendar range view print css 2026-09-21 16:16:17 +02:00
adisposkofh 72e7b215ef reworked fhc calendar range view to flip axes 2026-09-21 14:30:20 +02:00
adisposkofh 1357ed5d3d fixed absences header styling 2026-09-17 15:13:02 +02:00
adisposkofh fba5953b59 merged features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 14:57:23 +02:00
adisposkofh 7ea80395a8 merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 14:43:10 +02:00
adisposkofh 9a45efd558 merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 13:42:03 +02:00
Alexei Karpenko 073160dde4 Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool 2026-09-10 20:08:08 +02:00
Johann Hoffmann fe65dc60c4 finalized optional Studiengang Ansprechpartner Infoblock in Cis4 Studium page; 2026-09-02 18:13:41 +02:00
adisposkofh 88b5a0af46 lv plan range view print css 2026-09-02 16:04:44 +02:00
adisposkofh a53551b462 lv plan range view print css 2026-09-02 13:01:13 +02:00
Johann Hoffmann f15349029f WIP stg info sidebar in cis4 studium 2026-09-02 09:30:57 +02:00
adisposkofh dde95c8e01 lv plan range view styling 2026-08-31 14:03:12 +02:00
adisposkofh 5cfa398ea6 implemented lv plan range view 2026-08-29 15:46:03 +02:00
Manuela Thamer 90bce8d3d5 refactor templates: scroll table, only table header is sticky, rename css.file 2026-08-21 14:39:45 +02:00
Harald Bamberger cabda4cc35 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc 2026-08-20 08:13:30 +02:00
Harald Bamberger 37d9ef66ed Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc 2026-08-20 07:38:16 +02:00
Harald Bamberger 411d2192cb Merge branch 'master' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster 2026-08-19 18:44:20 +02:00
Harald Bamberger 391bf296d7 Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-19 18:41:29 +02:00
ma0068 9a592047a0 merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren 2026-08-18 13:54:02 +02:00
ma0068 e6947a3246 merge master into feature-77941/CIS_MA_Zeitsperren_Portieren 2026-08-18 12:04:28 +02:00
Harald Bamberger 7910cf3055 Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-13 17:36:38 +02:00
ma0068 83b06b6c50 - Redesign Tags
- use Slot in Filter Component
- use Phrase  for relaoding Tag in Detail Header
2026-08-10 14:04:45 +02:00
Johann Hoffmann 3c9f46941c Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4 2026-08-10 07:48:11 +02:00
Johann Hoffmann c9c92f82d3 WIP refactor 2026-08-06 10:33:46 +02:00
Harald Bamberger 2c2c6efc5e Merge branch 'studvw_lvvw_2026_08_rc' into studvw_lvvw_2026_08_rc_77973_76688 2026-08-04 15:41:37 +02:00
Harald Bamberger 0419286557 Merge branch 'master' into studvw_lvvw_2026_08_rc 2026-08-04 15:41:05 +02:00
Harald Bamberger cfa4dd8b8a add padding to filtercomponent tabulator-tableholder to prevent scrollbar covering a row in tables with few rows 2026-08-04 15:33:36 +02:00
Harald Bamberger 9f68fe6b3b Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc 2026-08-03 11:18:34 +02:00
ma0068 96b4210d21 refactor backend
css file for showing inactive items in dropdown
fix missing view for vertretung zeitsperren
sticky top for header
2026-07-30 15:29:15 +02:00
Harald Bamberger aa52c32d40 Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc 2026-07-28 15:50:06 +02:00
Johann Hoffmann 4e6a2d5218 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/views/CisRouterView/CisRouterView.php
#	cis/private/lehre/notenliste.xls.php
#	public/js/api/factory/lehre.js
#	public/js/apps/Cis/Cis.js
#	public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
#	public/js/helpers/StringHelpers.js
#	system/phrasesupdate.php
2026-07-27 15:41:29 +02:00
ma0068 68292b60af add Tags Incoming and Preabbrecher 2026-07-20 17:36:54 +02:00
ma0048 b21900d006 Merge remote-tracking branch 'origin/feature-70656/lvverwaltung_gruppen_im_baum_und_drag_and_drop' into feature-77372/lv_verwaltung_release_fine_tuning 2026-07-15 11:27:48 +02:00
Harald Bamberger f8d8d501ca Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback 2026-07-13 14:42:54 +02:00