 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 |
|
|
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 |
|
|
Harald Bamberger
|
dcd6cfd74b
|
increase width of horizontal split
|
2026-05-19 17:26:46 +02:00 |
|
|
Harald Bamberger
|
ca8fe5bd19
|
Merge branch 'feature-75959/StudVw_Automatische_Tags' into studvw_2026_05_rc_tags
|
2026-05-18 17:27:06 +02:00 |
|
|
adisposkofh
|
772f35c6ba
|
reworked sidenav toggler
|
2026-05-11 13:00:50 +02:00 |
|
|
Harald Bamberger
|
8b2ef4e832
|
Merge branch 'master' into feature-75959/StudVw_Automatische_Tags
|
2026-05-11 10:54:26 +02:00 |
|
|
adisposkofh
|
bf3d6275d4
|
header rework: single fixed element, ordering, small screen cutoff
|
2026-05-08 16:31:55 +02:00 |
|
|
Johann Hoffmann
|
9b823dbaa1
|
scope the zoom media query to abgabetool document selector to avoid spillover to CIS4 pages unintentionally; added noten headerfilter & persistence in flat table;
|
2026-05-08 12:44:07 +02:00 |
|
|
Harald Bamberger
|
bcfdf1e05c
|
Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into studvw_2026_05_rc
|
2026-05-06 17:33:33 +02:00 |
|
|
Johann HoffmannandHarald Bamberger
|
c16cf342cb
|
horizontalsplit component analog to verticalsplit; also built it into Studentenverwaltung.js menu; added defaultRatio prop to both components which defaults to 50/50 seperation
|
2026-05-06 15:54:49 +02:00 |
|
|
Johann Hoffmann
|
d0adf2dfc3
|
improved assistenz subqueries for zweitbetreuer infos by using common table expression instead of 8 subqueries; adapted splitMailsHelper function to take in body parameter to set default email text by parameter; dateStyles adapted so "in 12 days" also applies to termine without uploads; titleEdit modal in student & studentDetail component; send email to relevant assistenzen & projektarbeit betreuer about change from old to new title; 2nd flat table in AbgabetoolAssistenz that provides a list of all projektarbeittermine so it can be filtered & multiselected; multi delete & multi edit on these selected termine; tried to introduce a media query for zoomed in desktop users that shrinks fontsize and tabulator rows/cells; standard assistenz table column definitions have sensible minWidths & most columns are default invisible; fancy multiselect headerfilter on qualitygate 1/2 status column; actually figured out a vue watcher race codnition triggering loadProjektarbeiten twice unnecessarily; added a reload Button in case one observes a faulty reactivity somewhere in the table; fancy multiselect headerfilter on termin status column for flat table; Preselect current Semester & autoapply Filter for it; WIP refine new table & hunt for bugz; WIP working on the exact custom select handler Handling with filtered datasets; fixed root element style on legacy php view for abgabetool in old cis; WIP define more accurate allowed to delete & allowed to Edit conditions for abgabetermine -> currently benotet quality gates can be edited/deleted!!!!!
|
2026-05-06 13:46:26 +02:00 |
|
|
Harald Bamberger
|
453fc209b8
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-05-05 08:53:07 +02:00 |
|
|
Harald Bamberger
|
bd4ced9559
|
bugfix: comma as decimal separator prevents saving booking, bugfix messages tinymce not resizeable
|
2026-05-04 14:39:19 +02:00 |
|
|
ma0068
|
685fc69e5d
|
update css and add provisional height
|
2026-04-30 18:02:38 +02:00 |
|
|
ma0048
|
57597dac29
|
- added reservierungen
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
|
2026-04-28 20:17:50 +02:00 |
|