4976804f8d
Merge branch 'feature-18874/CISMoodleGradeImportMitUID'
2022-09-19 16:02:17 +02:00
4f35d6bf0a
Merge branch 'feature-19547/CoodleZeitsperrenAnzeigen'
2022-09-19 15:44:40 +02:00
141986ca67
Zeitsperren als fixe Termine
2022-07-13 11:11:22 +02:00
df321c4047
Merge branch 'master' into feature-19171/Wahlname
2022-05-27 13:30:19 +02:00
99db3ab9f6
Merge branch 'master' into feature-18486/reihungstest_stoppen_fuer_einzelne_personen
2022-05-27 11:01:30 +02:00
ba8543716c
Erweiterung Gesamtnotenimport um student_uid
2022-05-17 13:24:49 +02:00
84bc73f948
Anzeige Wahlname statt Vorname in Noten-,Anwesenheits und Fotoliste, Berücksichtigung in Cis-Suche
2022-05-11 11:18:01 +02:00
6df0982514
Anpassung DMS-Links
2022-04-28 16:48:48 +02:00
96a739f261
Merge branch 'master' into feature-16214/beaurteilungsformulare_ba_ma_arbeit
2022-04-25 15:15:15 +02:00
7c6adaabeb
rt stoppen fuer einzelene personen
2022-04-13 11:43:25 +02:00
d84ed369b1
fix merge conflicts after merging master
2022-03-28 11:36:47 +02:00
37f6a0caaa
Merge branch 'master' into feature-15391/Positive_Zeitsperre
...
# Conflicts:
# system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
c8e31dffa8
Adaptierung Phrasen und Authentifizierung
2022-02-10 15:02:43 +01:00
642ba32e0b
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-02-10 10:51:08 +01:00
fc47391392
Fix Bug Fehlermeldung, Ergänzung Zeittypen Covid, Ergänzung Dropdown um OE-Auswahl Leitung
2022-02-07 17:09:05 +01:00
615a55eccc
Adaptierungen Zeiterfassungen von Sprint177
2022-02-03 14:49:29 +01:00
1468c875d5
Merge branch 'master' into features-Zeiterfassung/Sprint177
2022-01-28 15:17:06 +01:00
f9b93f55e4
- Projektbetreuer model getBetreuerOfProjektarbeit: added full name and projekttyp_kurzbz are also
...
returned
- abgabe_lektor_details.php: grading only possible after end upload of thesis, and only beginning with SS2022
- added projektbeurteilung phrases to core locale and phrasesupdate.php
2022-01-25 12:40:41 +01:00
e83e9eed96
Phrasenkorrektur Testtool
2022-01-17 16:04:03 +01:00
c38435f176
Phrasenkorrektur Testtool nach Kopie vom Livesystem
2022-01-17 14:24:46 +01:00
00f8f5f125
Merge remote-tracking branch 'origin/master'
2022-01-17 14:17:19 +01:00
1b753f8070
Phrasenkorrekturen Testtool
2022-01-17 14:17:10 +01:00
12034b7637
#16842 Legende in Notenliste um iar ergänzt
2022-01-12 12:22:36 +01:00
f73f26c668
Added STG mail receiver to be addressed, when lector changes Zeitwunsch...
...
...and when lector has already been assigned to a course.
Only addressing Studiengaenge that are concerned by Zeitwunsch change
of lector.
LV must be assigned in the selected Studiensemester, but not in the past
2021-12-20 11:53:03 +01:00
7dd0bb1489
Merge branch 'master' into features-Zeiterfassung/Sprint177
2021-12-17 08:46:05 +01:00
e501681ff8
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2021-12-07 18:36:17 +01:00
6855686c66
Changed text and removed link mailto LV Planung
2021-12-07 18:25:55 +01:00
eb923cab9b
Changed: Now using textphrases
2021-11-29 11:31:03 +01:00
7c65e2ff53
Adapted Zeitwunsch GUI to use Zeitwunschgueltigkeit and save by Studiensemester
...
Major adaptation in GUI:
- Added Dropdown to select actual / next Studiensemester to edit Zeitwunsch
- Added Radiobuttons to allow changing or copying from earlier Studiensemester
- By selecting an earlier Studiensemester, the earlier Zeitwunsch is displayed in
the table and is ready to edit or just to save.
2021-11-23 15:56:07 +01:00
fbe4862a21
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree'
2021-11-15 16:40:48 +01:00
20fb38ba8f
change labels
2021-11-15 16:34:42 +01:00
4d1994ca63
menulayout, coding styles
2021-11-02 17:50:20 +01:00
530ede77ad
Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen
2021-10-27 17:06:14 +02:00
63949faef6
Phrasenupdate Zeitsperre
2021-10-27 09:29:37 +02:00
6927b668e3
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-15 12:10:59 +02:00
778b5906f9
Merge Branche Cristina
2021-09-02 11:35:17 +02:00
f0c5c3acb4
14774 Zeiterfassung: Homeoffice im CSV Import
2021-09-02 11:24:38 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
a1c4c31332
Update Phrasen und neue Funktion für Anzeige LV-Leitung
2021-08-06 10:46:14 +02:00
2bef17d65b
Update Phrasen Englisch und Codesniffer
2021-07-01 15:23:41 +02:00
36d162d2d7
13850 Bestätigungsmail an Mitarbeiter
2021-06-30 14:29:58 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
a1f4c90deb
Merge branch 'master' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-16 13:15:30 +02:00
08237bdb7f
Changed fhcomplete.org Wiki Links to fhcomplete.info
2021-04-15 11:54:50 +02:00
8730f28d91
Merge branch 'master' into feature/Anrechnungen_NEU
2021-04-15 09:53:15 +02:00
1f02506eaf
added phrase for Parbeitaktualität error
2021-04-10 04:09:29 +02:00
b29621354f
- abgabetool: added zweitbetreuer mailto Link incl. icons
...
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
2021-04-10 03:55:05 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
2850d0e5d8
"beautified" abgabetool page (lektorenansicht)
...
- moved Zweitbetreuer Text
- added icon with quickinfo for Tokensend instead of button with text
- disabled grading button and quickinfo instead of text for older Projektarbeiten
2021-03-31 23:45:17 +02:00
9ee473d9bd
Usability: Added Link to Anrechnungen in CIS LV Menu (for lectors)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 16:41:02 +02:00
Andreas Österreicher