 ma0048
|
96e0dcaf17
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into demo
|
2026-05-05 15:20:57 +02:00 |
|
|
ma0048
|
bf5ab6b7dd
|
nur prestudent mit dem bewerber status beruecksichtigen
|
2026-05-05 15:19:57 +02:00 |
|
|
ma0048
|
e229aa3639
|
Merge remote-tracking branch 'origin/feature-75887/reihungstest_constructor_popups' into demo
|
2026-04-16 14:45:50 +02:00 |
|
|
ma0048
|
eb26f4a15f
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into demo
# Conflicts:
# system/dbupdate_3.4.php
|
2026-04-16 14:45:00 +02:00 |
|
|
ma0048
|
13e8a1a9f6
|
bug fixed + infocenter performance
|
2026-04-16 14:21:02 +02:00 |
|
|
Andreas Österreicher
|
86538a163d
|
Merge branch 'master' into demo
|
2026-04-13 11:55:16 +02:00 |
|
|
Andreas Österreicher
|
3a91b12f31
|
Merge branch 'epic-56039/LV-Evaluierung'
|
2026-04-13 10:39:00 +02:00 |
|
|
Harald Bamberger
|
b2538075ee
|
use STV_TAGS_ENABLED config when preparing sql statement for students list to query tags only if enabled
|
2026-04-07 10:35:06 +02:00 |
|
|
Cristina
|
386cc779bf
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-04-02 15:49:20 +02:00 |
|
|
Cristina
|
08c6d58a50
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2026-04-02 14:24:39 +02:00 |
|
|
Cristina
|
3f53c5feba
|
Added: method getKFLByUID to get Kompetenzfeldleitung by UID
|
2026-04-02 14:23:59 +02:00 |
|
|
Andreas Österreicher
|
2c057aad58
|
Updated Startup Dump to Final 3.3 Version
|
2026-04-01 13:00:50 +02:00 |
|
|
ma0048
|
b6c2f2c9c9
|
Merge remote-tracking branch 'origin/master' into demo
# Conflicts:
# application/models/education/Projektarbeit_model.php
# application/views/CisRouterView/CisRouterView.php
# public/css/Cis4/Cis.css
# public/js/api/factory/studiensemester.js
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
# system/phrasesupdate.php
|
2026-04-01 11:34:28 +02:00 |
|
|
kindlm
|
c2ce831bca
|
Merge remote-tracking branch 'origin/master'
|
2026-03-26 11:43:59 +01:00 |
|
|
kindlm
|
21c1f13b28
|
Spalte "faktiv" (Foebis-Aktiv) im FAS
|
2026-03-26 11:43:20 +01:00 |
|
|
Andreas Österreicher
|
e0079bb812
|
Merge branch 'feature-71665/mc4_vorlage'
|
2026-03-26 09:27:00 +01:00 |
|
|
Andreas Österreicher
|
966d1d10f6
|
Merge branch 'feature-71566/Studienordnung_Anpassungen_fuer_Programme_und_Lehrgaenge'
|
2026-03-26 09:05:31 +01:00 |
|
|
Andreas Österreicher
|
76936ad74f
|
Merge branch 'feature-75703/BIS_Personalmeldung_Lehrgaenge'
|
2026-03-26 08:31:13 +01:00 |
|
|
Harald Bamberger
|
6fbb09eb6e
|
group or clause
|
2026-03-25 16:32:43 +01:00 |
|
|
Harald Bamberger
|
cfe1307018
|
Merge branch 'feature-68530/Dashboard_Cleanup_Admin'
|
2026-03-25 15:37:34 +01:00 |
|
|
Harald Bamberger
|
5139c3e44e
|
use array_replace_recursive instead of array_merge_recursive to prevent two scalar values being merged to an array
|
2026-03-25 15:15:05 +01:00 |
|
|
chfhtw
|
1951cd6fa8
|
split/rename dashboard api factories
|
2026-03-24 16:08:02 +01:00 |
|
|
chfhtw
|
e3093bdf3f
|
get magic funktionen (Mitarbeiter, Student) as dashboard presets
|
2026-03-24 15:15:36 +01:00 |
|
|
chfhtw
|
b11d8d056a
|
get access rights from permissionlib
|
2026-03-24 15:15:12 +01:00 |
|
|
chfhtw
|
3a4015eced
|
dashboard useroverwrite: remove doubles in other funktionen
|
2026-03-24 15:15:04 +01:00 |
|
|
chfhtw
|
aeb5d40840
|
rename api endpoints
|
2026-03-24 15:14:39 +01:00 |
|
|
Alexei Karpenko
|
49c712a5b6
|
Personalmeldung sws: rounding to 2 decimals
|
2026-03-24 13:57:23 +01:00 |
|
|
Harald Bamberger
|
46817b846a
|
fix e.g. long lines of underscores in cms content
|
2026-03-24 13:29:20 +01:00 |
|
|
Harald Bamberger
|
8c75608eaf
|
add menu entry for Dashboard Admin
|
2026-03-24 13:21:50 +01:00 |
|
|
chfhtw
|
2720ed9ffb
|
timezone from global object
|
2026-03-24 11:00:09 +01:00 |
|
|
chfhtw
|
2fc392c084
|
refactor dashboards Preset->addWidgets to (single) Preset->addWidget
|
2026-03-23 16:05:22 +01:00 |
|
|
chfhtw
|
ca630e94ae
|
remove debug line
|
2026-03-23 15:46:13 +01:00 |
|
|
chfhtw
|
9cff50fa3b
|
extract preset logic from dashboard admin api
|
2026-03-23 15:44:42 +01:00 |
|
|
chfhtw
|
3d7a6b1ad3
|
dashboard user api: empty -> check for false/null
|
2026-03-23 15:42:28 +01:00 |
|
|
chfhtw
|
f15fd40636
|
dashboardlib bug: array <=> stdclass
|
2026-03-23 15:41:32 +01:00 |
|
|
chfhtw
|
054cf2f258
|
correct form validation & typo in api dashboard widget
|
2026-03-23 15:06:25 +01:00 |
|
|
chfhtw
|
dc067a619b
|
make widgets resizeable in dashboard admin
|
2026-03-23 14:07:31 +01:00 |
|
|
chfhtw
|
2a762fa4ab
|
add renderers & timezone to dashboard admin for calendar widget
|
2026-03-23 13:22:30 +01:00 |
|
|
chfhtw
|
ccade6ae0e
|
rename dashboard admin controller and views
|
2026-03-23 11:47:28 +01:00 |
|
|
chfhtw
|
6971aed030
|
parsing happens in backend not frontend
|
2026-03-23 11:46:45 +01:00 |
|
|
chfhtw
|
60e556b2a8
|
wrong case
|
2026-03-23 11:33:45 +01:00 |
|
|
chfhtw
|
42fbbc5257
|
remove unused file
|
2026-03-23 11:28:31 +01:00 |
|
|
chfhtw
|
d01dedb79c
|
remove unused file
|
2026-03-23 11:23:01 +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 |
|
|
chfhtw
|
bac2c13da3
|
viewData is mandatory so we dont need to load it if its not set
|
2026-03-23 10:44:39 +01:00 |
|
|
ma0068
|
b90c26412a
|
DB update: new Organisationseinheittyp Programm
|
2026-03-20 13:06:16 +01:00 |
|
|
chfhtw
|
65c7ad2aac
|
use correct error handling in FhcApi in case of success
|
2026-03-20 12:29:01 +01:00 |
|
|
chfhtw
|
126a2d3b7b
|
add deepToRaw function to helpers/ObjectUtils
|
2026-03-20 11:23:35 +01:00 |
|
|
Harald Bamberger
|
60734f708e
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-03-19 16:20:06 +01:00 |
|