 ma0068
|
6eb9c2ac22
|
update filtering
|
2025-02-04 14:57:35 +01:00 |
|
|
ma0068
|
7fbff20dd9
|
new Tab Gruppen
|
2025-02-04 14:49:41 +01:00 |
|
|
Andreas Österreicher
|
ecbc1c8d09
|
Merge branch 'sonstiges-55231/bfi-anrechnung-infobox-ausblenden'
|
2025-01-30 14:56:24 +01:00 |
|
|
Andreas Österreicher
|
07194cfaff
|
- Index für lehre.tbl_anrechnungen hinzugefügt um Ladezeiten zu verbessern
- Bugfix fuer Detailseite der Lehrenden
|
2025-01-30 14:54:16 +01:00 |
|
|
Cristina
|
3eb1f7b06b
|
Added array 'display_infobox' to config file anrechnung.php and adapted code to display only if set to true
|
2025-01-30 12:08:28 +01:00 |
|
|
Cristina
|
f2917b9ed7
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2025-01-30 10:23:56 +01:00 |
|
|
Harald Bamberger
|
5b12e5eea7
|
Merge branch 'feature-5534/Gehaltsgraph_Valorisierung'
|
2025-01-28 18:37:18 +01:00 |
|
|
Harald Bamberger
|
e068abd124
|
rename functions since they manipulate data for using it in a chart
|
2025-01-28 18:35:25 +01:00 |
|
|
Harald Bamberger
|
d7cbe475bf
|
Merge branch 'master' into feature-5534/Gehaltsgraph_Valorisierung
|
2025-01-28 17:39:19 +01:00 |
|
|
Harald Bamberger
|
402691b5cd
|
Merge branch 'feature-53903/PV21_Valorisierungs_akutelle_Liste_ausgeben_ohne_Valorisierungskonfiguration'
|
2025-01-28 16:40:35 +01:00 |
|
|
Harald Bamberger
|
6a2a4c22b3
|
Merge branch 'master' into feature-53903/PV21_Valorisierungs_akutelle_Liste_ausgeben_ohne_Valorisierungskonfiguration
|
2025-01-28 16:14:39 +01:00 |
|
|
Cristina
|
9a4211c980
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2025-01-28 13:58:14 +01:00 |
|
|
Harald Bamberger
|
4cd1bc3d63
|
Merge branch 'feature-18073/No-Reply-for-Sanchomails'
|
2025-01-28 13:05:53 +01:00 |
|
|
Harald Bamberger
|
4258e60b8b
|
Merge branch 'master' into feature-18073/No-Reply-for-Sanchomails
|
2025-01-28 13:03:53 +01:00 |
|
|
Harald Bamberger
|
7f6744047f
|
check in ci mail config if constants in global config are defined
|
2025-01-28 11:26:01 +01:00 |
|
|
Harald Bamberger
|
39c2e44719
|
sancho default sender konfigurierbar machen
|
2025-01-28 10:22:30 +01:00 |
|
|
Harald Bamberger
|
d6abfbbc23
|
fix typo
|
2025-01-23 16:33:03 +01:00 |
|
|
Harald Bamberger
|
87220e1789
|
move tbl_valorisierung_* to core since they are used in vertragsbestandteillib and gehaltsbestandteillib
|
2025-01-23 16:13:47 +01:00 |
|
|
Harald Bamberger
|
c5d79f750e
|
add parameter withvalorisationhistory to use valorisation history or not
|
2025-01-23 15:31:17 +01:00 |
|
|
Harald Bamberger
|
af79090de0
|
modify to consider valorisation history, TODO cleanup valorisation tables dependency on FHC-Core-Personalverwaltung Extension
|
2025-01-22 17:18:22 +01:00 |
|
|
Harald Bamberger
|
8ce4b452ec
|
use encryption parameters in lamda function and return replacement string
|
2025-01-22 17:16:47 +01:00 |
|
|
Harald Bamberger
|
4c46a5f5c7
|
modify regex to match optional table alias and ignore column alias equal to column name
|
2025-01-22 15:09:20 +01:00 |
|
|
Harald Bamberger
|
781e2dbd15
|
Merge branch 'feature-54841/DVs_Abhaengigkeit_zu_SAP_Extension_beseitigen'
|
2025-01-21 14:29:05 +01:00 |
|
|
Harald Bamberger
|
d9532d7607
|
Merge branch 'master' into feature-54841/DVs_Abhaengigkeit_zu_SAP_Extension_beseitigen
|
2025-01-21 13:40:26 +01:00 |
|
|
Werner Masik
|
1853e44cf3
|
add valorized data for chart display
|
2025-01-21 12:58:09 +01:00 |
|
|
Alexei Karpenko
|
e65322965f
|
sancho mail: added config for haeder/footer image path, renamed custom mail config entries to sancho mail config entries, images are always attached inline (when using Code Igniter)
|
2025-01-20 16:24:56 +01:00 |
|
|
Harald Bamberger
|
899c36c52c
|
default sancho image comes from global config now
|
2025-01-20 15:10:52 +01:00 |
|
|
Harald Bamberger
|
71d1a808f8
|
Merge branch 'master' into feature-18073/No-Reply-for-Sanchomails
|
2025-01-20 13:36:17 +01:00 |
|
|
Andreas Österreicher
|
1489706027
|
Merge branch 'Monika70-Export'
|
2025-01-16 13:22:51 +01:00 |
|
|
Andreas Österreicher
|
103df5afe5
|
Merge branch 'Export' of https://github.com/Monika70/FHC-Core into Monika70-Export
|
2025-01-16 13:21:14 +01:00 |
|
|
Andreas Österreicher
|
ba2b41f63a
|
Merge branch 'feature-55289/pep_fine_tuning'
|
2025-01-16 13:12:26 +01:00 |
|
|
ma0048
|
f381ef229e
|
- index tbl_lehrveranstaltung_faktor_lvid hinzugefuegt
- sortierung gleichgezogen
|
2025-01-16 10:38:01 +01:00 |
|
|
Alexei Karpenko
|
ece4f4a8b5
|
sancho mails: enabled removing of header/footer and custom header/footer images in code igniter code, legacy code: global ids for images are created only if config is set
|
2025-01-15 16:52:11 +01:00 |
|
|
Szabo Mónika
|
f1234c0b99
|
Update studentenexportextended.xls.php
Zusätzliche Spalte Person_id hinzufügen
|
2025-01-15 14:37:06 +01:00 |
|
|
Harald Bamberger
|
fd67974d55
|
fix typo
|
2025-01-15 13:35:58 +01:00 |
|
|
Harald Bamberger
|
a1a9e96bc0
|
permission basis/gehaelter
|
2025-01-15 13:34:16 +01:00 |
|
|
Andreas Österreicher
|
aab0f339ab
|
Merge branch 'feature-55316/international_skills_credits_entfernen_neue_massnahmen'
|
2025-01-15 13:06:04 +01:00 |
|
|
Harald Bamberger
|
d4bb06c4f6
|
Merge branch 'feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen'
|
2025-01-15 09:20:54 +01:00 |
|
|
Harald Bamberger
|
0770ec2bd8
|
Merge branch 'master' into feature-54920/DB_Model_encrypted_columns_spaltenname_enthaelt_anderen_spaltennamen
|
2025-01-15 09:03:41 +01:00 |
|
|
Alexei Karpenko
|
13d86edcfc
|
sancho mails: added CUSTOM_MAIL_USE_IMAGES config for sending mails without header/footer, removed option to hide mail html
|
2025-01-14 17:24:40 +01:00 |
|
|
ma0048
|
50aca4a545
|
- umbenennung auf internatinal credits
|
2025-01-14 11:00:26 +01:00 |
|
|
Alexei Karpenko
|
6c858141fd
|
deleted mailtest file
|
2025-01-13 16:22:45 +01:00 |
|
|
Alexei Karpenko
|
6b169d4183
|
sancho mail: configuration of header/footer and sender is possible
|
2025-01-11 15:43:30 +01:00 |
|
|
Harald Bamberger
|
46914e8a65
|
bugfix wenn mehrere karenzen im abgefragten zeitraum vorhanden sind
|
2025-01-07 14:38:08 +01:00 |
|
|
Andreas Österreicher
|
a802e67faf
|
Merge branch 'pep_deploy'
|
2024-12-16 13:57:15 +01:00 |
|
|
Andreas Österreicher
|
2c91756a36
|
Added missing APP PEP to checksystem
|
2024-12-16 13:29:55 +01:00 |
|
|
Harald Bamberger
|
0d2882d8aa
|
Merge branch 'feature-25999/SearchbarStudent'
|
2024-12-13 12:11:12 +01:00 |
|
|
Harald Bamberger
|
f62108f1d4
|
change concatenation of verband, use contact email in Stv search result, use dummy image when viewing anothers profile and foto is null or foto_sperre is not false
|
2024-12-13 12:09:16 +01:00 |
|
|
ma0048
|
746f8ab35a
|
Merge branch 'feature-54822/filtercomponent_custom_headerfilter' into pep_deploy
|
2024-12-13 11:51:11 +01:00 |
|
|
ma0048
|
70b44c2202
|
Merge branch 'feature-40717/pep_faktor' into pep_deploy
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-12-13 11:50:53 +01:00 |
|