Commit Graph
3495 Commits
Author SHA1 Message Date
Harald Bamberger b97dec7343 Merge branch 'master' into cis40_2026-09_ma_rc 2026-10-05 13:11:02 +02:00
Andreas Österreicher 36064afbba Fixed Testing Projektarbeit Seeds 2026-10-01 15:33:05 +02:00
Harald Bamberger e24a66a454 Merge branch 'master' into cis40_2026-09_ma_rc 2026-09-30 15:59:57 +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 34761db664 rename phrase 2026-09-30 10:56:30 +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 9605227139 Merge branch 'master' into cis40_2026-09_ma_rc 2026-09-29 14:58:05 +02:00
adisposkofh 1e2dbeac10 added 'no news available' message 2026-09-25 11:27:00 +02:00
adisposkofh fb0a92a636 fhc calendar print action button on range view 2026-09-23 17:08:20 +02:00
adisposkofh 4d2a6589b4 reworked range view presets and localized label 2026-09-23 15:39:41 +02:00
adisposkofh 191a81058c lv plan mode phrases fix 2026-09-23 15:32:07 +02:00
adisposkofh dd25c7af75 lv plan mode phrases fix 2026-09-23 15:31:58 +02:00
adisposkofh adce19e651 changed lv plan range view icon, added tooltips on lv plan view buttons 2026-09-23 14:40:52 +02:00
Andreas Österreicher b3b6d847a7 Merge branch 'feature-62260/international_skills_groupheader_filter' 2026-09-23 14:36:13 +02:00
Andreas Österreicher 80365de28c Merge branch 'feature-62602/mehrfachnennungen_innerhalb_einer_kategorie' 2026-09-23 14:35:36 +02:00
ma0048 241eec3ef2 Merge remote-tracking branch 'origin/master' into feature-54225/reihungstest_ablauf_fuer_quereinsteiger
# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php
2026-09-23 11:29:43 +02:00
Andreas Österreicher 2050f5ae65 Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool' 2026-09-23 11:14:01 +02:00
adisposkofh 43b849e787 merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-22 13:44:49 +02:00
Harald Bamberger be7527e994 increase length of column taglib in table public.tbl_notiz_typ 2026-09-22 09:52:09 +02:00
Alexei Karpenko 0dadaece08 Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool 2026-09-16 16:59:09 +02:00
adisposkofh fc89a25d3a merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 16:31:56 +02:00
adisposkofh aaf8dd16ef merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 15:08: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
Harald Bamberger 75c341d983 Merge branch 'master' into cis40_2026-05_ma_rc 2026-09-16 10:55:13 +02:00
Harald Bamberger 9c43374267 Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-09-15 07:53:10 +02:00
adisposkofh 80e17e264a merged cis40_2026-05_ma_rc into 2026-09-14 17:08:15 +02:00
Paolo ea7c0cccde Added base seeders for testing/staging/demoing 2026-09-14 16:36:12 +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 9a3532265f information schema guard check for the data migration & table alter statements aswell, so they dont run on every checksystem.php invocation 2026-09-10 11:50:51 +02:00
Manuela Thamer 4ac108174b rename title delete button 2026-09-08 08:29:08 +02:00
Johann Hoffmann fe65dc60c4 finalized optional Studiengang Ansprechpartner Infoblock in Cis4 Studium page; 2026-09-02 18:13:41 +02:00
Johann Hoffmann f15349029f WIP stg info sidebar in cis4 studium 2026-09-02 09:30:57 +02:00
Ivymaster 349a0641cd BUG: Fix for non active news display 2026-08-31 13:54:35 +02:00
Ivymaster 5fff45e302 Added check for date existence 2026-08-27 11:00:43 +02:00
Ivymaster de627171d5 WIP 2026-08-26 14:46:49 +02:00
Andreas Österreicher e32691994c Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-08-26 08:21:30 +02:00
Ivymaster 6f3c0fb174 WIP 2026-08-25 17:22:44 +02:00
Ivymaster 76130bbf2c Added translations for cms newsAdmin section 2026-08-24 13:08:28 +02:00
Ivymaster 708ffac47e WIP 2026-08-20 17:05:38 +02:00
Harald Bamberger 4e3ddad8c1 Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc 2026-08-20 15:22:04 +02:00
Harald Bamberger c2cb3f5b7a move message to inner if 2026-08-20 15:21:47 +02:00
Harald Bamberger c24b6e6b32 fix variable name 2026-08-20 09:49:07 +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 16166db31a Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc 2026-08-20 07:46:02 +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
Harald Bamberger 7ce81ad4bd Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung' 2026-08-19 07:57:07 +02:00