 Harald Bamberger
|
ed579be7d1
|
Merge remote-tracking branch 'origin/master' into feature-53904/Vertragshistorie_valorisierte_Gehaelter_anzeigen
|
2025-01-08 15:49:53 +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 |
|
|
ma0048
|
c0d2474ad2
|
-dbupdate gegencheck eingebaut
- delete restrict auf cascade geändert
|
2024-12-13 11:42:00 +01:00 |
|
|
Harald Bamberger
|
5a174e554a
|
use studentStv in Studentenverwaltung config, add aktiv to student and studentStv result, use studentStv in searchbar component, add searchbar_inaktiv css class, use aktiv to render inactive studentStv results with css class searchbar_inaktiv
|
2024-12-13 11:25:02 +01:00 |
|
|
ma0048
|
3451741327
|
- ON DELETE RESTRICT auf ON DELETE CASCADE bei bei den notizen
- sql angepast
|
2024-12-13 11:03:46 +01:00 |
|
|
SimonGschnell
|
a3840d4c77
|
update(Searchbar/Student):shows dummy image if the student has foto_spere true
|
2024-12-13 10:47:34 +01:00 |
|
|
SimonGschnell
|
9a1777d1aa
|
fix(_student searchfunction):fixes the sql logic for non active students
|
2024-12-12 15:35:56 +01:00 |
|
|
Harald Bamberger
|
4a86a48969
|
Merge branch 'master' into feature-25999/SearchbarStudent
|
2024-12-12 15:27:08 +01:00 |
|
|
Andreas Österreicher
|
1f01c55d71
|
LVPlan Feedback Link auf Startseite entfernt
|
2024-12-12 15:06:02 +01:00 |
|
|
Harald Bamberger
|
80222b7186
|
Merge branch 'master' into feature-25999/SearchbarStudent
|
2024-12-12 14:55:41 +01:00 |
|
|
Harald Bamberger
|
d0266e7ef0
|
add vuejs3_dev to composer.json and ci javascript config file to switch between vuejs dev and prod version, alter FHC-Footer to use new config
|
2024-12-12 14:49:15 +01:00 |
|
|
Harald Bamberger
|
3039fd2a1e
|
Merge branch 'master' into feature-25999/SearchbarStudent
|
2024-12-12 13:57:03 +01:00 |
|
|
ma0048
|
5b3ffcfc9a
|
- faktor berechtigung angepasst
|
2024-12-12 12:37:24 +01:00 |
|
|
Andreas Österreicher
|
03d8205722
|
Merge branch 'feature-46905/LV_plan_feedback_Link_aendern'
|
2024-12-12 11:30:00 +01:00 |
|
|
SimonGschnell
|
df8d4de50b
|
fix(SearchbarLib/_student): the cis search does not include students that are not aktiv and has a seperate search function for the student search for the Cis and the studentverwaltung
|
2024-12-12 09:42:38 +01:00 |
|
|
Harald Bamberger
|
9af3f1ec0f
|
Merge branch 'feature-25999/LvMenuFix'
|
2024-12-11 17:50:03 +01:00 |
|
|
SimonGschnell
|
85d59f18be
|
refactor(searchbar/Student): studiengang/verband/email are queried for the display in the searchbar component
|
2024-12-11 15:30:41 +01:00 |
|
|
ma0048
|
6a1e518da1
|
- defaultheaderfilter function in eigenes file verschoben
|
2024-12-11 13:44:19 +01:00 |
|
|
ma0048
|
8127091e2e
|
- tags werden im fas nicht angezeigt
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
|
2024-12-11 13:25:38 +01:00 |
|
|
SimonGschnell
|
a357001648
|
feature(Searchbar/StudentenSuche): adds student to the searchbar options and adds shadow to the searchbar
|
2024-12-11 12:34:58 +01:00 |
|
|
SimonGschnell
|
2567db7725
|
fix(LvMenu.js): fixes layout of MenuPunkt if multiple moodle links are available
|
2024-12-11 11:28:40 +01:00 |
|
|
Andreas Österreicher
|
034e1397e8
|
Merge branch 'feature-52814/infocenter_infocentermitarbeiter_spalte_beim_loeschen_des_dokuments'
|
2024-12-11 08:36:27 +01:00 |
|
|
Andreas Österreicher
|
35ded7950f
|
Merge branch 'feature-46974/neuer_filter_ueber_ueberfaellige_buchungen'
|
2024-12-11 08:00:54 +01:00 |
|
|
Andreas Österreicher
|
a6a74cd1e0
|
Merge branch 'feature-40413/testtool_sperren_bei_namen_mit_hochkomma'
|
2024-12-11 07:52:27 +01:00 |
|
|
Andreas Österreicher
|
bae48fa175
|
Merge branch 'master' into feature-40413/testtool_sperren_bei_namen_mit_hochkomma
|
2024-12-11 07:13:20 +01:00 |
|
|
Andreas Österreicher
|
94f4761163
|
Merge branch 'bug-54917/Gruppenmanagement_Berechtigung'
|
2024-12-11 07:07:44 +01:00 |
|
|
Alexei Karpenko
|
cc99d2b378
|
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
|
2024-12-10 12:03:58 +01:00 |
|
|
Harald Bamberger
|
8031a7ace8
|
Merge branch 'master' into feature-53904/Vertragshistorie_valorisierte_Gehaelter_anzeigen
|
2024-12-10 10:38:46 +01:00 |
|
|
Andreas Österreicher
|
07ee3e1f4e
|
Import der Leistungsstipendien angepasst. Neue Spaltenreihenfolge, Keine
automatische Gegenbuchung, Import der Bankdaten
|
2024-12-06 12:50:58 +01:00 |
|
|
Harald Bamberger
|
3cea79cb28
|
Merge branch 'feature-25999/C4_cleanup_rc'
|
2024-12-04 12:44:08 +01:00 |
|
|
Harald Bamberger
|
e159dc44dc
|
Merge branch 'master' into feature-25999/C4_cleanup_rc
|
2024-12-04 12:43:06 +01:00 |
|
|
Andreas Österreicher
|
055cea2002
|
Termin3 entfernt aus Default Checksystem
|
2024-12-04 11:25:49 +01:00 |
|
|
Harald Bamberger
|
f105bdb36a
|
revert FhcApi.js to current master
|
2024-12-04 11:09:37 +01:00 |
|
|
Harald Bamberger
|
1b445005af
|
remove addMeta debug info
|
2024-12-04 09:28:59 +01:00 |
|
|
Harald Bamberger
|
2fee03ebcc
|
remove sprachen menu from main nav
|
2024-12-04 09:17:15 +01:00 |
|
|
Harald Bamberger
|
d30ba24d2f
|
add config cis_send_profil_update_mails, use it in profil update controllers
|
2024-12-04 09:15:44 +01:00 |
|
|
ma0048
|
631010821b
|
- check bei projectstunden ob stunden eingetragen sind
|
2024-12-03 17:08:03 +01:00 |
|
|
ma0048
|
b34a7bfabc
|
- custom filter tabulator
|
2024-12-03 16:13:48 +01:00 |
|
|
ma0048
|
6a1af1b2dd
|
- fuer lehre tab planungsstatus hinzugefuegt
- config fuer planungsstatus
- tags ohne notiz setzen
|
2024-12-03 15:31:32 +01:00 |
|
|
ma0048
|
19b56ff252
|
- tags
- phrases
- stundensatzbydatum
- filter nur count
|
2024-12-03 12:36:54 +01:00 |
|
|
Harald Bamberger
|
af2f3348b4
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-12-03 07:37:22 +01:00 |
|
|
Johann Hoffmann
|
41ad440cd4
|
update newsWidget template & css, fixed carousel css transition;
|
2024-12-02 16:41:42 +01:00 |
|
|
ma0048
|
1a1ed49f8b
|
- styling für neuen tag
- hover effekt
- tagicon statt plus
|
2024-12-02 13:09:38 +01:00 |
|
|
Johann Hoffmann
|
bf5e8e9c0e
|
Merge branch 'feature-25999/C4_cleanup' into feature-25999/C4_anwesenheiten_widget
|
2024-12-02 10:57:40 +01:00 |
|