 ma0048
|
855ec94445
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# public/css/Cis4/CoreCalendarEvents.css
# public/js/components/Calendar/Base.js
# public/js/components/Calendar/Base/Grid.js
# public/js/components/Calendar/Base/Header.js
# public/js/components/Calendar/Base/Header/Datepicker.js
# public/js/components/Calendar/Mode/Week.js
# system/phrasesupdate.php
# system/seeders/015_kalender.sql
# tests/cypress/.env.example
|
2026-10-15 15:07:52 +02:00 |
|
|
adisposkofh
|
ebb0042881
|
Merge branch 'cis40_2026-05_ma_rc_83533-mylv-rework' into cis40_2026-09_ma_rc
|
2026-10-09 11:22:47 +02:00 |
|
|
adisposkofh
|
d8959d9776
|
added groups to myLv lehreinheiten table
|
2026-10-06 17:00:28 +02:00 |
|
|
Harald Bamberger
|
1f570f8495
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-06 14:19:18 +02:00 |
|
|
adisposkofh
|
4549c92d50
|
myLV lehreinheiten table formatting
|
2026-10-06 13:48:23 +02:00 |
|
|
ma0048
|
83d8884df3
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/models/education/Lehreinheit_model.php
|
2026-10-06 12:57:38 +02:00 |
|
|
Harald Bamberger
|
efc8fa1eeb
|
Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router
|
2026-10-06 10:27:46 +02:00 |
|
|
adisposkofh
|
a5aa4c8466
|
added myLv lehrenheiten table
|
2026-10-05 15:14:04 +02:00 |
|
|
Harald Bamberger
|
b97dec7343
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-05 13:11:02 +02:00 |
|
|
Harald Bamberger
|
4ba2869632
|
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
|
2026-10-05 11:22:59 +02:00 |
|
|
ma0048
|
07f258248b
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# system/dbupdate_3.4.php
|
2026-10-01 14:02:32 +02:00 |
|
|
Harald Bamberger
|
59c5100a86
|
Merge branch 'feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix' into cis40_2026-09_ma_rc
|
2026-09-29 18:19:39 +02:00 |
|
|
Harald Bamberger
|
9605227139
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-29 14:58:05 +02:00 |
|
|
ma0048
|
89fb90aef3
|
Added into ListView:
- Raumverschiebung
- Sichtbarkeitsstatus Änderung
- Tags hinzufügen/bearbeiten/löschen
ModalContent:
- Mailversandmöglichkeit
- Letzte Änderung der Zeitwünsche
- Anzahl Studierende
- Kollisionsinformation Details
- Tags des Eintrags anzeigen
- Anmerkungen zum LV-Teil
- Voller Name des Lehrenden
- Raumoptimierungs
- Sprung zur LV-Verwaltung (derzeit deaktiviert)
- Sprung zur Lehrveranstaltungsadminsitration (Vilesci)
- Lektor & Raum hinzufügen zum Filter
|
2026-09-29 11:12:41 +02:00 |
|
|
Johann Hoffmann
|
f817527ab9
|
fix faulty master merge conflicts; adapted getTermine & getPaAbgaben in Paabgabe_model.php; reordered created hook in ProjektabgabeUebersicht.js to start loading phrasen immediately;
|
2026-09-24 11:50:00 +02:00 |
|
|
Johann Hoffmann
|
754e619e30
|
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Compat.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2026-09-24 11:25:31 +02:00 |
|
|
Andreas Österreicher
|
2050f5ae65
|
Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool'
|
2026-09-23 11:14:01 +02:00 |
|
|
adisposkofh
|
96104fd93a
|
fixed news model query syntax error
|
2026-09-22 14:37:12 +02:00 |
|
|
adisposkofh
|
c34a74c040
|
reservierung model table alias fix
|
2026-09-22 14:16:31 +02:00 |
|
|
adisposkofh
|
43b849e787
|
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-22 13:44:49 +02:00 |
|
|
Harald Bamberger
|
579a55a00d
|
fix nested ternary operators
|
2026-09-17 14:18:10 +02:00 |
|
|
Andreas Österreicher
|
0a00caa1e4
|
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
|
2026-09-17 14:00:07 +02:00 |
|
|
adisposkofh
|
fc89a25d3a
|
merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 16:31:56 +02:00 |
|
|
adisposkofh
|
aaf8dd16ef
|
merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 15:08:23 +02:00 |
|
|
adisposkofh
|
7ea80395a8
|
merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 14:43:10 +02:00 |
|
|
adisposkofh
|
09f18d9039
|
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
|
2026-09-15 17:03:03 +02:00 |
|
|
ma0048
|
2ffaf36270
|
suche fuer lehreinheiten und lehrveranstaltungen in der lvverwaltung
|
2026-09-15 15:46:48 +02:00 |
|
|
adisposkofh
|
80e17e264a
|
merged cis40_2026-05_ma_rc into
|
2026-09-14 17:08:15 +02:00 |
|
|
Ivymaster
|
e1af778d8f
|
Implemented custom table for kalender notiz, and added postgres triffer function for removing resources and stale notes
|
2026-09-11 14:27:17 +02:00 |
|
|
ma0048
|
c90f7a31bb
|
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
|
2026-09-11 12:03:06 +02:00 |
|
|
Alexei Karpenko
|
073160dde4
|
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
|
2026-09-10 20:08:08 +02:00 |
|
|
adisposkofh
|
67f30c7765
|
fixed issue with wrong semester displayed and wrong ical dates used in my lv plan
|
2026-09-09 11:30:43 +02:00 |
|
|
Johann Hoffmann
|
f15349029f
|
WIP stg info sidebar in cis4 studium
|
2026-09-02 09:30:57 +02:00 |
|
|
ma0048
|
61ef27e5eb
|
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
|
2026-09-01 12:20:12 +02:00 |
|
|
Ivymaster
|
7275d6e897
|
Minor mods
|
2026-08-31 15:49:05 +02:00 |
|
|
ma0048
|
51886960bb
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
|
2026-08-31 12:49:28 +02:00 |
|
|
Ivymaster
|
304870f18c
|
BUG: Fix active messages display
|
2026-08-31 12:36:27 +02:00 |
|
|
Ivymaster
|
a0ea54d0c0
|
Fixed bugs found during testing
|
2026-08-26 17:08:53 +02:00 |
|
|
Ivymaster
|
de627171d5
|
WIP
|
2026-08-26 14:46:49 +02:00 |
|
|
Andreas Österreicher
|
e32691994c
|
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
|
2026-08-26 08:21:30 +02:00 |
|
|
Ivymaster
|
6f3c0fb174
|
WIP
|
2026-08-25 17:22:44 +02:00 |
|
|
Harald Bamberger
|
6d641bbd06
|
pass in uid by reference
|
2026-08-24 13:56:55 +02:00 |
|
|
Harald Bamberger
|
9bf5bc2ad9
|
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
|
2026-08-24 07:26:12 +02:00 |
|
|
Ivymaster
|
708ffac47e
|
WIP
|
2026-08-20 17:05:38 +02:00 |
|
|
Harald Bamberger
|
75d2cabdbe
|
bugfix lv-plan
|
2026-08-20 15:10:26 +02:00 |
|
|
Harald Bamberger
|
cabda4cc35
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-08-20 08:13:30 +02:00 |
|
|
Harald Bamberger
|
a5d4629f07
|
Merge branch 'cis40_2026-05_ma_rc_78461_reservation_group_options' into cis40_2026-05_ma_rc
|
2026-08-20 07:48:18 +02:00 |
|
|
Harald Bamberger
|
16166db31a
|
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
|
2026-08-20 07:46:02 +02:00 |
|
|
Harald Bamberger
|
37d9ef66ed
|
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
|
2026-08-20 07:38:16 +02:00 |
|
|
Harald Bamberger
|
b2213bff62
|
Merge branch 'bugfix-70747/excluding-zeitverfugbarkeit-zeitsperren-option' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
|
2026-08-20 07:14:47 +02:00 |
|