Commit Graph

2993 Commits

Author SHA1 Message Date
Alexei Karpenko 309faaae06 phrasesupdate coma bugfix 2025-10-06 16:57:31 +02:00
Alexei Karpenko 1c21e8f88d Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten 2025-10-06 16:54:41 +02:00
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
Johann Hoffmann a021c85920 schönere phrasen 2025-09-25 17:23:03 +02:00
Harald Bamberger 58b942f044 fix typo in template_kurzbz 2025-09-25 16:14:09 +02:00
Alexei Karpenko 3f0f48a4e0 Student.php: bracket bugfix, return person id of added Personinstead of true, Studierendenverwaltung Projektarbeit phrases 2025-09-22 17:34:50 +02:00
Harald Bamberger eaec76c3d2 Merge branch 'master' into feature-63437/cis4_iframe_component 2025-09-22 17:03:42 +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 473715c25c Merge branch 'master' into feature-40314/Electronic_Onboarding_Anbindung_IDA 2025-09-18 17:39:31 +02:00
ma0048 41dbd83bdb phrases
tags als default entfernt
master gemerged
2025-09-18 15:27:04 +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
ma0048 57531d956d gruppen in eigenen tab verschoben
styling
phrases
2025-09-18 13:18:44 +02:00
Andreas Österreicher e80cfc207e Merge branch 'feature-63370/AnwesenheitenMicrotuning' 2025-09-17 14:59:49 +02:00
Harald Bamberger 34eb373061 adapt phrase profilUpdateInformationMessage 2025-09-16 13:39:15 +02:00
Harald Bamberger cb5623d228 label and layout for documents 2025-09-16 13:32:28 +02:00
Harald Bamberger 9e6ae4f5a4 add phrase lehre/termineImLvPlan 2025-09-15 11:31:35 +02:00
Johann Hoffmann b8d197d923 deleted entschuldigung email betreff 2025-09-12 13:50:25 +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
Harald Bamberger 20f7c2e841 Merge branch 'master' into feature-63370/AnwesenheitenMicrotuning 2025-09-11 13:06:46 +02:00
Johann Hoffmann c9425a0061 'fileuploaddatum' phrase => 'FileUpload-Datum' 2025-09-10 11:20:32 +02:00
Johann Hoffmann b95dd49d0e assistenz uploaddatum -> antragsdatum; added new column 'fileuploaddatum'; 2025-09-10 10:44:43 +02:00
Johann Hoffmann eee9d6b691 raumsuche phrasen change & fix; fhcapi -> api; lvMenu try to use phrasenkey for responsiveness instead of the already looked up phrase; tried investigating news carousel bug, not sure if bug or feature - at least declared non changing variables as const; 2025-09-08 17:28:09 +02:00
Andreas Österreicher 6fb06397be Merge branch 'master' into feature-63359/StV_API_error_clustering 2025-09-04 14:32:10 +02:00
Johann Hoffmann 2c3754b33f more tooltips so people can avoid reading the wiki 2025-09-03 13:51:41 +02:00
Alexei Karpenko fc845ebf4e Studierendenverwaltung Projektarbeit: separate saving of Projektarbeit and Betreuer, added action for editing Betreuer 2025-09-02 15:04:45 +02:00
Johann Hoffmann fa6d651b21 phrasen & permissionLib/Phrases reference $param in lvMenuBuild event 2025-09-01 16:48:24 +02:00
ma0048 34528bb014 iframe content hinzugefuegt 2025-08-29 13:19:00 +02:00
ma0048 9a35ee5945 raum content im alten cis wieder auf tablesorter 2025-08-27 11:48:35 +02:00
Andreas Österreicher 1025a8b461 Removed Duplicate Phrase 2025-08-25 11:19:20 +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
Johann Hoffmann 9707258e62 Merge remote-tracking branch 'origin/master' into feature-61592/AnwesenheitenFinetuning
# Conflicts:
#	public/js/components/Bootstrap/Modal.js
#	system/phrasesupdate.php
2025-08-19 09:43:30 +02:00
chfhtw 42a81a4558 API error clustering 2025-08-18 13:06:59 +02:00
Harald Bamberger b9e3c47be9 Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung 2025-08-14 18:03:36 +02:00
Harald Bamberger e7f58ca1ba Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung 2025-08-13 07:33:13 +02:00
Harald Bamberger 80f1edca8f Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231 2025-08-11 15:25:16 +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 9ad2198b02 update phrase Stundenplan => LV-Plan, Feiertag => Ferien / Feiertag, Holiday => Holidays 2025-08-06 11:14:37 +02:00
chfhtw c96db9f573 reworked StV favorites (only 1st tier version) 2025-08-06 11:06:57 +02:00
Johann Hoffmann 0605baf68f capitalize tab phrases; style&phrase change for Attendance Check Date Datepicker; Picture col min width icrease so the title is readable in english; 2025-08-06 10:45:37 +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 66caf47d98 Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4 2025-08-01 15:54:22 +02:00
ma0068 1cb637cb7f Tab Betriebsmittel: change type kaution to text, edit validations and add translations 2025-08-01 10:55:11 +02:00
Johann Hoffmann 913b218fca phrasenupdate Stundenplan -> LV-Plan; tooltip update/remove; 2025-08-01 10:53:15 +02:00
ma0068 9c1eb35e88 Tab Contact: Phrase for Validation Length PLZ 2025-07-31 11:18:37 +02:00
ma0068 16db622bc9 Tab Details
- add anrede to modelValue
- add Validations Alias and Lehrverbandsgruppe
- add Phrase invalidAlias
- add translation to validation Integer for field semester
2025-07-30 17:55:59 +02:00
chfhtw ee13cfadba Use labels for types in CIS & StV searchbar 2025-07-30 12:33:48 +02:00
ma0068 53e395aca4 Tab Notizen, Messages: use HTML-Entities
Tab Abschlussprüfung, Prestudent, Pruefung, Dokument: Phrasen
2025-07-24 14:40:48 +02:00
ma0048 1d63b8de44 schluesselverwaltung & kontaktdatenverwaltung gui hinzugefuegt
betriebsmittel einschraenkung ueber prop moeglich (nur anzeige)
2025-07-24 11:18:58 +02:00