ede656845a
Merge branch 'feature-61230/FHC4_Studierendenverwaltung_LVTermine' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 16:25:36 +02:00
f5a3598c39
Merge branch 'feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 16:18:43 +02:00
55419c50f7
Merge branch 'feature-60875/FHC4_Studierendenverwaltung_Anrechnungen' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 15:42:17 +02:00
375d56960a
Merge branch 'feature-60874/FHC4_Studierendenverwaltung_Dokumente' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 13:49:58 +02:00
1faab59716
Merge branch 'feature-55992/FHC4_Studierendenverwaltung_Messaging' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 13:34:34 +02:00
1ac6e50784
Merge branch 'feature-55991/FHC4_Studierendenverwaltung_Gruppen' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231
2025-05-21 13:30:07 +02:00
c861278aa8
Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine
2025-05-21 13:26:14 +02:00
2297055949
Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien
2025-05-21 13:25:36 +02:00
bf3127d518
Merge branch 'master' into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
2025-05-21 13:24:52 +02:00
10f731f2e2
Merge branch 'master' into feature-60874/FHC4_Studierendenverwaltung_Dokumente
2025-05-21 13:24:08 +02:00
b498da8603
Merge branch 'master' into feature-55992/FHC4_Studierendenverwaltung_Messaging
2025-05-21 13:18:43 +02:00
a2b77411cb
Merge branch 'master' into feature-55991/FHC4_Studierendenverwaltung_Gruppen
2025-05-21 10:47:48 +02:00
7d4fda4fe6
Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv
2025-05-21 10:46:31 +02:00
2db7f812ab
Fehlerkurzbz korrigiert
2025-05-20 11:31:28 +02:00
8b89d6f1cb
Merge branch 'feature-48553/UHSTAT_Meldung_fuer_Privatuniversitaeten'
2025-05-20 11:11:39 +02:00
6dfa7089e7
Merge branch 'master' into feature-54827/internationalisierungsmassnahmen_optimierungen
2025-05-05 11:08:25 +02:00
a4777724dc
Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine
2025-04-24 07:59:13 +02:00
854223a2d7
Merge master into feature-60874/FHC4_Studierendenverwaltung_Dokumente
2025-04-23 13:37:31 +02:00
d780b472a6
Merge master into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
2025-04-23 11:11:35 +02:00
874c91e21c
Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien
2025-04-23 09:41:50 +02:00
b9bd0e53d8
merge master into feature-55992/FHC4_Studierendenverwaltung_Messaging
2025-04-22 14:58:56 +02:00
2b9805aeb3
merge master into feature-55991/FHC4_Studierendenverwaltung_Gruppen
2025-04-22 13:58:27 +02:00
7b30869f7c
make where clause more precise
2025-04-17 18:28:26 +02:00
ac5e95e6b9
dbchanges: add columns lvexport and lvexport_sum to hr.tbl_gehalstyp, add gehaltstyp zulage_allin, set zulage_allin for gbs attached to vbs freitext allin
2025-04-17 08:20:30 +02:00
59f83c33b0
Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv
2025-04-16 15:24:59 +02:00
af30a3408c
add switch stundenplan, excel export, phrases
2025-04-15 14:22:39 +02:00
1888c51a48
master gemerged
...
phrase bugfix
2025-04-15 11:09:59 +02:00
ad93a0a84c
Merge branch 'refs/heads/master' into feature-54827/internationalisierungsmassnahmen_optimierungen
2025-04-15 11:09:05 +02:00
419c199e84
new Tab GemeinsameStudien
2025-04-09 11:06:50 +02:00
d75e26f8ae
add basis framework for lv dates
2025-04-07 14:46:36 +02:00
1991418931
New tab Dokumente
2025-04-03 16:54:56 +02:00
a54f7531bf
add column betrag to table hr.tbl_sachaufwand
2025-04-02 16:07:09 +02:00
8a7290359a
Merge branch 'master' into feature-56033/Beurteilungsformulare_neue_Kategorien_ab_SS2025
2025-04-01 10:52:04 +02:00
b4b2d8da49
added UHSTAT issue resolvers, bugfix getuhstatdata: check for empty array
2025-03-30 23:38:35 +02:00
392c15da77
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-03-27 09:32:59 +01:00
410231a427
Merge branch 'master' into feature-37620/reihungslisten
2025-03-24 09:18:26 +01:00
b18b3b62a7
Merge remote-tracking branch 'origin/feature-40953/LV-Template_Uebersichtsseite' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2025-03-20 13:29:49 +01:00
2a4f1af69f
Added phrase lizenzkategorie to Softwarebereitstellung app
2025-03-20 11:41:47 +01:00
b8417869b5
Added phrase lizenzkategorie to Softwarebereitstellung app
2025-03-20 11:18:26 +01:00
b75c9cc524
portation of tab Anrechnungen
...
- switch version edit / non edit in config
2025-03-20 11:16:05 +01:00
a0ce635c7e
Refactor and Cleanup
...
- adapt tabulator and queries for remote pagination
- use formatterParams for messageStati to enable phrase logic
- adapt logic for mitarbeiter_uid
- refactor logic to use new Page, new Tab and newDiv with one child component
- add phrases
2025-03-12 15:04:37 +01:00
129637cf4f
add phrases for lvdev overviews
2025-03-12 12:05:34 +01:00
ff65852643
neues recht basis/verwaltet_oe
2025-03-12 08:21:03 +01:00
ed2f895d8b
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-03-11 17:35:34 +01:00
639c7d7e41
Studentenverwaltung Archiv: added phrases for table headings
2025-03-10 22:50:04 +01:00
eedbab21a2
Added phrases for Softwarebereitstellung
2025-03-06 09:58:15 +01:00
3a83d468ef
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-03-06 09:50:55 +01:00
11ba9c9911
Merge branch 'refs/heads/feature-55289/pep_fine_tuning' into pep_deploy_2025_03_06
...
# Conflicts:
# system/dbupdate_3.4.php
2025-03-05 15:15:57 +01:00
f942836453
Merge remote-tracking branch 'origin/feature-54945/filtercomponent_custom_headerfilter_datum' into pep_deploy_2025_03_06
...
# Conflicts:
# public/js/tabulator/filters/defaultHeaderFilter.js
2025-03-05 15:14:49 +01:00
2cbbcc9039
changed Projektarbeitsbeurteilung phrase
2025-03-05 14:52:55 +01:00
Harald Bamberger