856706bc1c
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
2026-06-26 15:17:27 +02:00
0411befe8d
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-06-26 15:16:18 +02:00
138c80c97a
Merge branch 'master' into cis40_2026-02_rc
2026-06-26 15:15:47 +02:00
a23d079001
Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren
2026-06-26 14:07:14 +02:00
41d40102f3
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
2026-06-22 15:26:48 +02:00
95e63f865c
add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php
2026-06-22 15:25:51 +02:00
e2dadcd208
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
2026-06-18 13:23:49 +02:00
164c11e10a
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
2026-06-18 13:20:25 +02:00
eb9c882fe9
Merge branch 'master' into cis40_2026-02_rc
2026-06-18 08:48:52 +02:00
245d0d3369
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-06-17 17:15:37 +02:00
30b8a406a5
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
2026-06-01 09:10:35 +02:00
9ee6a0a01a
Merge branch 'studvw_2026_05_rc_tags' into demo-cis40
2026-05-19 09:51:42 +02:00
9030cdcc76
Merge branch 'feature-70747/Zeitsperren_auf_VueJs_Portieren' into cis40_2026-05_ma_rc
2026-05-04 18:06:21 +02:00
ac0eddf4c7
Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc
2026-05-04 17:05:36 +02:00
e373e797f4
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-05-04 17:01:44 +02:00
b9c8c71274
Merge branch 'feature-61236/Cis4MenuErweiterung' into cis40_2026-05_ma_rc
2026-05-04 16:01:18 +02:00
293352ac3c
move apps/Cis.js -> apps/Cis/Cis.js
2026-04-27 16:26:32 +02:00
ff876afbb3
Merge branch 'feature-76464/reworking-use-of-controller-viewdata' into cis40_2026-02_rc
2026-04-23 14:20:19 +02:00
e984425e36
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
2026-04-23 12:09:09 +02:00
f6747713a1
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
2026-04-20 11:13:14 +02:00
59ddf175ed
Merge branch 'master' into feature-61236/Cis4MenuErweiterung
2026-04-20 10:47:58 +02:00
bd47ad2b8c
Merge branch 'master' into feature-69187/CIS_MA_Pruefungsprotokolle
2026-04-20 09:48:34 +02:00
1c2491385f
Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags
2026-04-17 10:38:00 +02:00
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
695f3455e6
add function generateCSSsIncludeIfExtensionCssExists and use to load additional tag.css from extensions if exists
2026-04-16 15:20:11 +02:00
13e8a1a9f6
bug fixed + infocenter performance
2026-04-16 14:21:02 +02:00
7eb888d2e3
rename apps/Dashboard/Fhc to apps/Cis
2026-04-03 11:19:38 +02:00
26f67b6798
rename apps/Cis to apps/Cis/Menu
2026-04-03 11:16:19 +02:00
ccade6ae0e
rename dashboard admin controller and views
2026-03-23 11:47:28 +01:00
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
7c1762d467
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
2026-03-18 09:20:53 +01:00
61d133b2fd
Merge branch 'master' into feature-68296/Vue_Router_via_Extensions_erweitern_ma0080
2026-03-10 12:14:35 +01:00
5347cb1d63
add config STV_TAGS_ENABLED and use it to enable or disable tags in StudVw
2026-03-03 17:15:23 +01:00
28f4a38752
refactor helper function extendableApps to singleton helper class ExtendableAppsHelper and use it in FHC-Header and FHC-Footer, revert previous changes to other CI views
2026-02-27 16:50:50 +01:00
2dd732b924
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/views/CisRouterView/CisRouterView.php
2026-02-27 10:38:24 +01:00
667a00d64b
Merge branch 'master' into feature-68296/Vue_Router_via_Extensions_erweitern_ma0080
2026-02-26 16:05:32 +01:00
1ae072390e
revert changes to add fhcApps property, not using path based syntax, to CI views include array
2026-02-26 15:27:52 +01:00
a9b343646e
Merge branch 'master' into vv_und_studvw_2026_02_rc4
2026-02-13 10:49:09 +01:00
609e226057
place email buttons inside a tiered menu (dropdown for some) to save space in the ui;
2026-02-10 14:25:45 +01:00
e13a7069dc
Studverwaltung: refactor from Tabulator5 to 6, reformat some date entries
2026-02-06 13:18:09 +01:00
1cd332115b
Changes Vertragsverwaltung
...
- refactor from Tabulator 5 to Tabulator 6
- not reloading contract list after changes of Status or Detail to keep row selection
- Start reselection of current row
2026-02-06 10:38:29 +01:00
464f04b254
merge studvw_2026_02_rc4 in vv_und_studvw_2026_02_rc4
2026-02-05 11:57:03 +01:00
17f11fa871
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/controllers/api/frontend/v1/Lehre.php
# application/models/education/Lehrveranstaltung_model.php
# application/models/education/Note_model.php
# application/views/CisRouterView/CisRouterView.php
# public/js/api/factory/studiensemester.js
# public/js/components/Bootstrap/Offcanvas.js
# public/js/components/Overlay/FhcOverlay.js
2026-02-04 15:40:34 +01:00
69749da331
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
2026-02-03 11:46:19 +01:00
9ae9feb9ea
Merge branch 'bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen' into studvw_2026-02_rc4
2026-02-03 10:48:06 +01:00
e689531224
merge master into bug-69548/FHC4_Studierendenverwaltung_Aufnahmetermine_Gesamtnote_berechnen
2026-02-02 16:31:13 +01:00
b9eaac18b0
merge Master into feature-39571/Studierendenverwaltung_CoreNotizcontroller
2026-02-02 16:21:47 +01:00
b5382b1bdf
Form and Start Backend
2026-01-15 15:39:42 +01:00
954c55ba3e
finetuning
2026-01-12 17:06:35 +01:00
02153e469f
Dashboard Admin Cleanup
...
- refactoring Api: FHC-API controller for Edit/Update, widgets and presets
- delete dashboard with Prompt
- phrases
2025-12-19 11:39:31 +01:00
Harald Bamberger