Commit Graph
19840 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 b97dec7343 Merge branch 'master' into cis40_2026-09_ma_rc 2026-10-05 13:11:02 +02:00
Harald Bamberger 4ba2869632 Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters 2026-10-05 11:22:59 +02:00
Andreas Österreicher 293bb77179 Merge branch 'bug-44023/EingabemaskeEntwicklungsteamNamenOhneUid2' 2026-10-02 13:23:02 +02:00
Andreas Österreicher 3fe10d715d Fixed Saving of Entwicklungsteam 2026-10-02 13:14:41 +02:00
Andreas Österreicher 36064afbba Fixed Testing Projektarbeit Seeds 2026-10-01 15:33:05 +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 e24a66a454 Merge branch 'master' into cis40_2026-09_ma_rc 2026-09-30 15:59:57 +02:00
Harald Bamberger 3d8c4fa4d0 Merge branch 'feature-77757/WidgetsBerechtigung' 2026-09-30 15:48:00 +02:00
Harald Bamberger 272014bd78 remove odd phrases 2026-09-30 15:38:43 +02:00
Harald Bamberger 76a8e00edf Merge branch 'master' into feature-77757/WidgetsBerechtigung 2026-09-30 15:23:08 +02:00
Harald Bamberger a53c4fd623 Merge branch 'master' into cis40_2026-09_ma_rc 2026-09-30 12:24:30 +02:00
Harald Bamberger ce62713790 Merge branch 'bug-82297/ausweis-date-preview-issue' 2026-09-30 12:11:13 +02:00
Harald Bamberger 34761db664 rename phrase 2026-09-30 10:56:30 +02:00
Harald Bamberger c7131ed775 revert changes to old cis since issue does not occur there 2026-09-30 10:53:01 +02:00
Harald Bamberger b57e1984a8 Merge branch 'master' into bug-82297/ausweis-date-preview-issue 2026-09-30 10:20:28 +02:00
Harald Bamberger 59c5100a86 Merge branch 'feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix' into cis40_2026-09_ma_rc 2026-09-29 18:19:39 +02:00
Harald Bamberger cf6e747def Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix 2026-09-29 18:03:56 +02:00
Harald Bamberger 0fafb95bd8 Merge branch 'bugfix/cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09-news-administration' into cis40_2026-09_ma_rc 2026-09-29 14:59:34 +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
Ivymaster 43d5068cda Add fix for unconsistent translation options in news administration form 2026-09-28 19:01:26 +02:00
adisposkofh eebe2d6aec code formatting 2026-09-28 17:05:07 +02:00
adisposkofh d5fa13d644 reworked degree program contact persons collapsible -- moved 'contact persons' title w/in collapsible 2026-09-28 17:00:10 +02:00
adisposkofh 9ae2c91677 reworked degree program contact persons collapsible 2026-09-28 15:34:23 +02:00
adisposkofh 98175c5976 added post-title on degree program personnel 2026-09-25 12:34:58 +02:00
adisposkofh 94992f40bd added 'no news available' message in widget 2026-09-25 12:10:40 +02:00
adisposkofh 1e2dbeac10 added 'no news available' message 2026-09-25 11:27:00 +02:00
adisposkofh 153717b187 news page columns sizing 2026-09-25 10:45:06 +02:00
adisposkofh dd15b37f0f reworkedzeitsperre form styling and added 'cancel edit' button 2026-09-24 17:08:15 +02:00
adisposkofh 2fc2d12d65 renamed zeitsperrenma 'uid' column to 'name' 2026-09-24 16:36:28 +02:00
adisposkofh 0279813ba9 sticky first column in zeitsperrenma table 2026-09-24 16:33:42 +02:00
adisposkofh 1c4c90ffba fixed zeitsperrenma top buttons styling 2026-09-24 16:22:23 +02:00
Harald Bamberger acedc11be8 adapt styling detailheader employees 2026-09-24 14:39:38 +02:00
adisposkofh c79f664f9e autofilling room reservation description from title 2026-09-24 12:34:57 +02:00
Johann Hoffmann f817527ab9 fix faulty master merge conflicts; adapted getTermine & getPaAbgaben in Paabgabe_model.php; reordered created hook in ProjektabgabeUebersicht.js to start loading phrasen immediately; 2026-09-24 11:50:00 +02:00
Johann Hoffmann 754e619e30 Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
# Conflicts:
#	application/models/education/Projektarbeit_model.php
#	public/js/apps/Cis/Cis.js
#	public/js/components/Cis/Compat.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2026-09-24 11:25:31 +02:00
adisposkofh fb0a92a636 fhc calendar print action button on range view 2026-09-23 17:08:20 +02:00
adisposkofh 03858b12b9 fhc calendar week view fast-forward/backward buttons to move 4 pages 2026-09-23 16:52:19 +02:00
adisposkofh 342dede1b0 fhc calendar datepicker formatting 2026-09-23 16:25:52 +02:00
adisposkofh 6e1c0fe623 fhc calendar datepicker formatting 2026-09-23 16:25:32 +02:00
adisposkofh fece3f7477 showing short date format in range view datepicker 2026-09-23 16:23:21 +02:00
adisposkofh ab2333f708 limiting fetched columns in getUserData endpoint 2026-09-23 16:19:45 +02:00
adisposkofh c4e79ffdf9 filtering selectable semesters in range view depending on user age 2026-09-23 16:17:45 +02:00
Harald Bamberger 15c1da74a2 CisMenu: do not overwrite calculated url if menuitem is multiple times in menu tree 2026-09-23 16:09:42 +02:00