 Andreas Österreicher
|
666a6ea42c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-10-02 14:32:00 +02:00 |
|
|
Harald Bamberger
|
10b6641aa2
|
Merge branch 'master' into feature-63394/StV_Favoriten_64_Zeichen_Variablenbeschraenkung
|
2025-09-30 14:51:10 +02:00 |
|
|
Harald Bamberger
|
eaec76c3d2
|
Merge branch 'master' into feature-63437/cis4_iframe_component
|
2025-09-22 17:03:42 +02:00 |
|
|
Alexei Karpenko
|
473715c25c
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2025-09-18 17:39:31 +02:00 |
|
|
ma0048
|
6a31eade8b
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-09-18 15:04:01 +02:00 |
|
|
Andreas Österreicher
|
012ae4ac62
|
Berufsschule für Lehrlinge als aktivität hinzugefügt in der
Zeitaufzeichnung
|
2025-09-12 09:39:06 +02:00 |
|
|
chfhtw
|
d9c716a62b
|
convert wert from public.tbl_variable to TEXT
|
2025-09-12 08:37:18 +02:00 |
|
|
ma0048
|
34528bb014
|
iframe content hinzugefuegt
|
2025-08-29 13:19:00 +02:00 |
|
|
ma0048
|
2b7f56622c
|
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/organisation/Studienplan_model.php
# application/models/person/Notiz_model.php
# application/models/ressource/Mitarbeiter_model.php
# public/js/components/Stv/Studentenverwaltung.js
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-08-07 11:03:05 +02:00 |
|
|
Harald Bamberger
|
37b67641ef
|
Merge branch 'feature-40128/Mehrere_Suchergebnisse_für_selbe_Person' into rc1_FHC4_C4
|
2025-08-01 16:19:23 +02:00 |
|
|
Harald Bamberger
|
ed17e87afd
|
dbupdate create Cis40 dashboard if it does not exist, 61730_Dashboard_Anpassungen only output message if something was updated
|
2025-06-30 14:51:42 +02:00 |
|
|
cgfhtw
|
f596f16255
|
Merge branch 'master' into feature-40128/Mehrere_Suchergebnisse_für_selbe_Person
|
2025-06-17 09:24:18 +02:00 |
|
|
ma0048
|
f96bfbe000
|
lehrfächerverteilung v1
|
2025-05-28 07:51:10 +02:00 |
|
|
SimonGschnell
|
ebcb33b316
|
update(Dashboard DataStructure Migration): adds migration file to change all old datastructures from the dashboard.tbl_dashboard_preset
|
2025-05-15 12:05:34 +02:00 |
|
|
Harald Bamberger
|
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 |
|
|
Harald Bamberger
|
a54f7531bf
|
add column betrag to table hr.tbl_sachaufwand
|
2025-04-02 16:07:09 +02:00 |
|
|
Andreas Österreicher
|
410231a427
|
Merge branch 'master' into feature-37620/reihungslisten
|
2025-03-24 09:18:26 +01:00 |
|
|
Harald Bamberger
|
ff65852643
|
neues recht basis/verwaltet_oe
|
2025-03-12 08:21:03 +01:00 |
|
|
ma0048
|
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 |
|
|
Harald Bamberger
|
5843d1d58e
|
Merge branch 'master' into merge_FHC4_C4
|
2025-02-03 15:53:55 +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 |
|
|
ma0048
|
42a09ffa9e
|
- lehrform beim faktor hinzugefuegt
- indexes
- delete restrict -> delete cascade bei der faktor tabelle
- neues recht fuer reports -> direktzugriff
|
2025-01-29 15:21:01 +01:00 |
|
|
Harald Bamberger
|
7f645b363f
|
Merge branch 'master' into merge_FHC4_C4
|
2025-01-28 16:54:08 +01:00 |
|
|
Harald Bamberger
|
519aa2f9b2
|
Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4
|
2025-01-27 18:34:42 +01:00 |
|
|
SimonGschnell
|
e53dae24e6
|
update(Calendar Locale): updates the locale used by the english language to en-GB instead of en-US
|
2025-01-27 13:24:47 +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
|
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 |
|
|
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 |
|
|
Andreas Österreicher
|
055cea2002
|
Termin3 entfernt aus Default Checksystem
|
2024-12-04 11:25:49 +01:00 |
|
|
Andreas Österreicher
|
e63234e7bc
|
Gegencheck und Anwesenheit App eingefügt
|
2024-12-02 10:09:09 +01:00 |
|
|
Harald Bamberger
|
cdc9e08cd0
|
cleanup C4 dbupdates
|
2024-11-21 15:14:13 +01:00 |
|
|
Harald Bamberger
|
8eb7d18ff9
|
remove C4 Menu from checksystem
|
2024-11-21 14:04:35 +01:00 |
|
|
Alexei Karpenko
|
4e857c9e4e
|
Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA
|
2024-11-20 17:00:26 +01:00 |
|
|
ma0048
|
45bc65d32a
|
- Tags testversion
- header tooltips
- lehre spalte markieren wenn altes semester
- legende-tab hinzugefuegt
|
2024-11-11 07:33:49 +01:00 |
|
|
cgfhtw
|
02a5465708
|
Merge branch 'master' into feature-40128/Mehrere_Suchergebnisse_für_selbe_Person
|
2024-11-05 15:41:48 +01:00 |
|
|
SimonGschnell
|
37dffbba19
|
fix(Dashboard widget Url): adds validation method for both input fields and fixes confirm delete dialog
|
2024-11-05 11:32:02 +01:00 |
|
|
Harald Bamberger
|
20715d6ef5
|
add permission basis/cis
|
2024-11-04 15:36:46 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
ma0048
|
5cee80ed12
|
- rtliste automatisierte messages
|
2024-10-18 13:24:39 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
Alexei Karpenko
|
bf1bc8d1a9
|
added new contact type email unverifiziert and adresse type meldeadresse (mainly for electronic onboarding)
|
2024-10-13 13:32:15 +02:00 |
|
|
SimonGschnell
|
23badc3404
|
CIS4 MENU sql update WIP
|
2024-09-27 12:20:37 +02:00 |
|
|
cgfhtw
|
6c08741450
|
Fist Draft
|
2024-09-20 14:31:25 +02:00 |
|
|
Johann Hoffmann
|
d9f5646ad1
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-09-10 10:17:55 +02:00 |
|
|
Harald Bamberger
|
1f4628720a
|
Merge branch 'feature-39911/Suche_um_raeume_erweitern' into feature-25999/C4
|
2024-09-09 11:50:27 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
cgfhtw
|
67398607d8
|
dbupdate entry
|
2024-08-14 09:11:14 +02:00 |
|
|
Johann Hoffmann
|
c9471c344d
|
added unruly person boolean column to tbl_person; studStatus/leitung added a checkbox to mark persons as unruly unrelated to studstatus datastate;
|
2024-07-31 14:37:26 +02:00 |
|