Ivymaster
|
e3210f227b
|
BUG: Fixed issue with unuseable collapsed columns in tempus calender
|
2026-09-24 15:53:09 +02:00 |
|
Ivymaster
|
c9bbd4e84e
|
WIP: Multiple weeks range view
|
2026-09-24 13:54:34 +02:00 |
|
Ivymaster
|
d7a5c73233
|
Random bug fixes, minor mods and styling changes
|
2026-09-17 09:25:19 +02:00 |
|
Ivymaster
|
c0e2b8f25d
|
Merge branch 'feature-78281/tempus_mehrwochenansicht_new' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-14 16:11:11 +02:00 |
|
Ivymaster
|
9e65b6788d
|
BUG: Fix issues with grid layout from big conflicts
|
2026-09-14 16:09:27 +02:00 |
|
Ivymaster
|
b10eba44ca
|
Conflits resolved
|
2026-09-14 14:38:17 +02:00 |
|
Ivymaster
|
71dd7f9e38
|
BUG: Some random issue
|
2026-09-10 14:16:12 +02:00 |
|
Ivymaster
|
ccb33cde60
|
WIP
|
2026-09-09 16:53:23 +02:00 |
|
Ivymaster
|
5dc314febd
|
Included cherrypicked commits from lv plan range branch
|
2026-09-09 15:13:16 +02:00 |
|
Ivymaster
|
6ea1d4610d
|
Conflicts resolved
|
2026-09-08 10:20:52 +02:00 |
|
Ivymaster
|
02ff8d0e3c
|
Conflicts resolved
|
2026-09-02 15:01:56 +02:00 |
|
ma0048
|
90f62a7a9e
|
- merged master
- added raumvorschlag slots
|
2026-09-02 10:54:36 +02:00 |
|
Ivymaster
|
f0b1689a06
|
Third cherry pick of modifing event loading
|
2026-09-01 17:50:54 +02:00 |
|
Ivymaster
|
6e6cb8ae11
|
Second cherry pick of modifing event loading
|
2026-09-01 17:26:24 +02:00 |
|
Ivymaster
|
1bbe4368bb
|
First cherry pick of modifing event loading
|
2026-09-01 17:19:20 +02:00 |
|
ma0048
|
eeb49e1967
|
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
|
2026-09-01 13:08:38 +02:00 |
|
ma0048
|
8a448fde3c
|
Merge remote-tracking branch 'origin/feature-78288/tempus_usability' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# public/css/components/horizontalsplit.css
# public/js/components/Tempus/Filters/searchbarOptions.js
|
2026-09-01 12:48:07 +02:00 |
|
ma0048
|
e311d7ee00
|
Merge remote-tracking branch 'origin/feature-78289/tempus_parken_features' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:22:25 +02:00 |
|
Ivymaster
|
61d7268f90
|
Conflicts resolved
|
2026-09-01 11:52:25 +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 |
|
ma0048
|
623e8007b0
|
- sichtbarkeitsstatus hinzugefuegt
- tage ausblendbar
- lektor zur lvverwaltung verlinkt
- vertical splitter hinzugefuegt
- anzahl der einheiten hinzugefuegt
|
2026-08-26 09:01:47 +02:00 |
|
ma0048
|
8184555e12
|
location hinzugefuegt
raumlose planung aktivierbar/deaktivierbar
automatische zuteilung zum priorraum aktivierbar/deaktivierbar
raum zuteilung ueber dialog aktivierbar/deaktivierbar
|
2026-08-13 13:36:35 +02:00 |
|
ma0048
|
b0cb79d316
|
- geparkte Stunden im Parkfenster koennen entfernt werden
- sprung zur Woche
- farbe der lv
|
2026-08-12 08:26:40 +02:00 |
|
ma0068
|
83b06b6c50
|
- Redesign Tags
- use Slot in Filter Component
- use Phrase for relaoding Tag in Detail Header
|
2026-08-10 14:04:45 +02:00 |
|
Harald Bamberger
|
2c2c6efc5e
|
Merge branch 'studvw_lvvw_2026_08_rc' into studvw_lvvw_2026_08_rc_77973_76688
|
2026-08-04 15:41:37 +02:00 |
|
Harald Bamberger
|
0419286557
|
Merge branch 'master' into studvw_lvvw_2026_08_rc
|
2026-08-04 15:41:05 +02:00 |
|
Harald Bamberger
|
cfa4dd8b8a
|
add padding to filtercomponent tabulator-tableholder to prevent scrollbar covering a row in tables with few rows
|
2026-08-04 15:33:36 +02:00 |
|
Harald Bamberger
|
9f68fe6b3b
|
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
|
2026-08-03 11:18:34 +02:00 |
|
Harald Bamberger
|
aa52c32d40
|
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
|
2026-07-28 15:50:06 +02:00 |
|
Ivymaster
|
817afa545b
|
add tempus kalender tags
|
2026-07-22 15:52:31 +02:00 |
|
ma0068
|
68292b60af
|
add Tags Incoming and Preabbrecher
|
2026-07-20 17:36:54 +02:00 |
|
ma0048
|
9abaf30ed3
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# public/js/components/Calendar/Base/DragAndDrop.js
# public/js/components/Calendar/Base/Grid/Line.js
# public/js/composables/EventLoader.js
|
2026-07-15 15:48:44 +02:00 |
|
ma0048
|
b21900d006
|
Merge remote-tracking branch 'origin/feature-70656/lvverwaltung_gruppen_im_baum_und_drag_and_drop' into feature-77372/lv_verwaltung_release_fine_tuning
|
2026-07-15 11:27:48 +02:00 |
|
Harald Bamberger
|
f8d8d501ca
|
Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback
|
2026-07-13 14:42:54 +02:00 |
|
Harald Bamberger
|
7e6d670d82
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-07-13 14:32:51 +02:00 |
|
Harald Bamberger
|
b5e65cf072
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-07-08 16:42:04 +02:00 |
|
ma0068
|
9948060ed8
|
add shortcut str+alt for studentlist, add css for studentNames scrollable
|
2026-06-30 08:26:41 +02:00 |
|
ma0068
|
e7c133586b
|
adding of 4 new colours and use shorter labels for automated tags
|
2026-06-25 08:47:00 +02:00 |
|
Harald Bamberger
|
90b8788c93
|
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-06-18 14:46:05 +02:00 |
|
Johann Hoffmann
|
263b04e67f
|
reworked assistenz timeline feature; now shows all projektarbeiten of associated student in a more compact form;
|
2026-06-15 14:37:47 +02:00 |
|
Harald Bamberger
|
9ec876fc27
|
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-05-29 13:32:15 +02:00 |
|
Johann Hoffmann
|
6d79288f33
|
Merge remote-tracking branch 'origin/master' into feature-76657/AbgabetoolFinetuning
# Conflicts:
# system/phrasesupdate.php
|
2026-05-27 16:11:33 +02:00 |
|
Johann Hoffmann
|
2eb2c36d5b
|
replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes;
|
2026-05-26 17:06:39 +02:00 |
|
ma0048
|
9ac9804563
|
implement first version of collision checks
|
2026-05-26 14:09:58 +02:00 |
|
Johann Hoffmann
|
22eed92c86
|
Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning
|
2026-05-26 12:58:57 +02:00 |
|
Harald Bamberger
|
35f4d23308
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-26 09:28:40 +02:00 |
|
Harald Bamberger
|
bb366e4117
|
font color black on tag limette
|
2026-05-26 09:06:44 +02:00 |
|
Harald Bamberger
|
178c854941
|
Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning
|
2026-05-26 07:59:17 +02:00 |
|
Harald Bamberger
|
c099eec7a7
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-05-19 17:29:52 +02:00 |
|
Harald Bamberger
|
0962e62e69
|
Merge branch 'feature-76202/HorizontalSplit_from_master' into studvw_2026_05_rc
|
2026-05-19 17:28:08 +02:00 |
|