 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 |
|
|
Harald Bamberger
|
00fae2fa15
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4
|
2026-02-23 09:28:54 +01:00 |
|
|
Harald Bamberger
|
d98b7fd67a
|
fix duplicates in lvplan for special groups
|
2026-02-19 18:34:27 +01:00 |
|
|
ma0048
|
a94366d5a8
|
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into demo
# Conflicts:
# application/libraries/LektorLib.php
|
2026-02-12 10:37:45 +01:00 |
|
|
ma0048
|
0d55998640
|
Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into demo
|
2026-02-12 10:34:25 +01:00 |
|
|
ma0048
|
0ee8bd38cf
|
Merge remote-tracking branch 'origin/feature-69453/lv_verwaltung_karteireiter_noten' into demo
|
2026-02-12 10:34:12 +01:00 |
|
|
Harald Bamberger
|
69749da331
|
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2026-02-03 11:46:19 +01:00 |
|
|
ma0048
|
e26387a75a
|
lektoren tausch auch bei verplanten lektoren hinzugefuegt
|
2026-01-19 15:08:59 +01:00 |
|
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|
|
Andreas Österreicher
|
ea17847fad
|
Merge branch 'master' into demo
|
2025-12-18 13:40:45 +01:00 |
|
|
Alexei Karpenko
|
77a1067ea5
|
Studierendenverwaltung Projektbetreuer: default Stunden coming from global config, Stundensatz is requested each time BetreuerIn is selected
|
2025-12-03 15:32:21 +01:00 |
|
|
ma0048
|
8f974e8902
|
sql angepasst
|
2025-12-03 08:37:38 +01:00 |
|
|
ma0048
|
0de033e428
|
termine tab hinzugefuegt
|
2025-12-01 10:55:04 +01:00 |
|
|
Cristina
|
4ab0c0a44e
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-11-13 10:44:39 +01:00 |
|
|
Harald Bamberger
|
00eac334c0
|
Merge branch 'feature-63443/Studierendenverwaltung_Tab_Abschlusspruefung_Finetuning' into studvw_2025-11_rc
|
2025-11-10 12:48:01 +01:00 |
|
|
Harald Bamberger
|
0417afeea8
|
Merge branch 'feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren' into studvw_2025-11_rc
|
2025-11-04 14:56:54 +01:00 |
|
|
ma0068
|
e9c039dad2
|
Refactor detailHeader component for PV21
- own css.file for fotouplad
- domain as prop
- refactor link to Leitung
- slots for issuetracking and tags
|
2025-10-13 16:07:51 +02:00 |
|
|
Cristina
|
0d51df95f9
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-10-02 11:30:55 +02:00 |
|
|
Harald Bamberger
|
d148eaed11
|
ReservierungModel getRerservierungenMitarbeiter remove unused paramter ort_kurzbz, StundenplanLib only query reservations for logged in user if request is for the personal lv plan aka if ort_kurbz is empty
|
2025-10-01 16:19:15 +02:00 |
|
|
Cristina
|
cb77f3148a
|
Added method to get Stundenplantermine for Lehreinheit/Lehrveranstaltung
|
2025-10-01 13:50:57 +02:00 |
|
|
Alexei Karpenko
|
8e7a1a2ddd
|
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-09-22 13:39:36 +02:00 |
|
|
Alexei Karpenko
|
d062e8903f
|
Mitarbeiter model searchMitarbeiter method: removed redundant person id
|
2025-09-19 11:29:08 +02:00 |
|
|
Alexei Karpenko
|
566938d4f0
|
Studierendenverwaltung Abschlusspruefung: moved Vorsitz and Pruefer search to backend, searched by vorname or nachname or combinations of vorname and nachname
|
2025-09-18 17:25:00 +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 |
|
|
Alexei Karpenko
|
ce9a4e2e09
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-08-23 16:16:41 +02:00 |
|
|
Andreas Österreicher
|
703872adc9
|
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2025-08-20 11:14:40 +02:00 |
|
|
Harald Bamberger
|
e7f58ca1ba
|
Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung
|
2025-08-13 07:33:13 +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
|
66caf47d98
|
Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4
|
2025-08-01 15:54:22 +02:00 |
|
|
ma0048
|
1d63b8de44
|
schluesselverwaltung & kontaktdatenverwaltung gui hinzugefuegt
betriebsmittel einschraenkung ueber prop moeglich (nur anzeige)
|
2025-07-24 11:18:58 +02:00 |
|
|
ma0048
|
96cb546b68
|
permission check bug fixed
|
2025-07-23 14:14:03 +02:00 |
|
|
Alexei Karpenko
|
caa70715ad
|
Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-07-15 15:24:30 +02:00 |
|
|
ma0068
|
9d341cc045
|
getFunction for Student: restrict select attributes for person, update mitarbeiter model
|
2025-07-14 10:23:05 +02:00 |
|
|
ma0068
|
3ca49c5574
|
refactor function getHeader, get mitarbeiter_uid as prop instead of using function getMitarbeiterUid
|
2025-07-08 15:01:54 +02:00 |
|
|
SimonGschnell
|
9c30b5438f
|
update(StundenplanLib StundenplanQuery): removes the ort_kurzbz from the group by because the ort_kurzbz should be grouped in the aggregate function
|
2025-06-30 15:27:15 +02:00 |
|
|
Harald Bamberger
|
3db82aea95
|
stundenplan/lvplan revert changes to stundenplan_model and stundenplandev_model
|
2025-06-17 10:26:29 +02:00 |
|
|
Alexei Karpenko
|
e26bce2cf7
|
removed merge text from code
|
2025-06-10 14:14:32 +02:00 |
|
|
Alexei Karpenko
|
6f5fa9624f
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-06-10 13:58:50 +02:00 |
|
|
SimonGschnell
|
c080d1abb2
|
refactor(Rename Stundenplan to LvPlan):renames all methods and files from Stundenplan to LvPlan
|
2025-06-10 11:46:19 +02:00 |
|
|
ma0068
|
7d2da9e7f6
|
Merge master into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2025-06-06 11:46:31 +02:00 |
|
|
ma0048
|
f96bfbe000
|
lehrfächerverteilung v1
|
2025-05-28 07:51:10 +02:00 |
|
|
Harald Bamberger
|
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 |
|
|
Alexei Karpenko
|
382006aa8b
|
Projektarbeit Studierendenverwaltung: now possible to save and edit Projektbetreuer
|
2025-05-16 13:37:21 +02:00 |
|
|
Alexei Karpenko
|
405062f549
|
added Projektarbeit tab to Studierendenverwaltung, adding, editing, deleting of Projektarbeiten now possible
|
2025-05-07 18:36:51 +02:00 |
|
|
Johann Hoffmann
|
54e8a855f4
|
Merge branch 'master' into feature-25999/C4_cleanup
# Conflicts:
# public/js/apps/Dashboard/Fhc.js
# public/js/components/Cis/Cms/Content.js
# public/js/components/Cis/Cms/News.js
# public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
# public/js/components/Cis/Mylv/LvUebersicht.js
# public/js/components/Cis/Stundenplan/Stundenplan.js
# public/js/components/DashboardWidget/Ampel.js
# public/js/components/DashboardWidget/News.js
# public/js/components/DashboardWidget/Stundenplan.js
# public/js/components/DashboardWidget/Url.js
# system/phrasesupdate.php
|
2025-04-25 10:58:02 +02:00 |
|
|
ma0068
|
af30a3408c
|
add switch stundenplan, excel export, phrases
|
2025-04-15 14:22:39 +02:00 |
|
|
ma0068
|
d75e26f8ae
|
add basis framework for lv dates
|
2025-04-07 14:46:36 +02:00 |
|
|
ma0068
|
b75c9cc524
|
portation of tab Anrechnungen
- switch version edit / non edit in config
|
2025-03-20 11:16:05 +01:00 |
|
|
Johann Hoffmann
|
bc7dba1c14
|
legacy raumsuche.php -> cis4 vue component
|
2025-02-28 16:41:18 +01:00 |
|
|
ma0068
|
31af28a7c4
|
Merge branch 'feature-52533/PV21_Karteireiter_Vertraege' of github.com:FH-Complete/FHC-Core into feature-52533/PV21_Karteireiter_Vertraege
|
2025-02-19 16:37:47 +01:00 |
|