 Cris
|
9bec0c61de
|
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
# Conflicts:
# system/phrasesupdate.php
|
2024-08-01 13:55:51 +02:00 |
|
|
Cris
|
6f216dbe52
|
Added phrases to Softwarebereitstellung
|
2024-07-30 15:38:36 +02:00 |
|
|
Harald Bamberger
|
16ab9998b0
|
Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz
|
2024-07-11 14:44:44 +02:00 |
|
|
Harald Bamberger
|
115151473a
|
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-07-11 11:57:45 +02:00 |
|
|
Cris
|
eead73f10c
|
Added phrases for core and softwarebereitstellung to phrasesupdate.php
|
2024-07-10 14:44:01 +02:00 |
|
|
Cris
|
4e053a4769
|
Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung
|
2024-07-08 12:24:44 +02:00 |
|
|
Harald Bamberger
|
dd0bdddbc6
|
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
|
2024-07-01 14:12:48 +02:00 |
|
|
Cris
|
7f32cca476
|
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
|
2024-06-26 11:54:51 +02:00 |
|
|
Cris
|
580f063efe
|
Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung
|
2024-06-26 10:48:59 +02:00 |
|
|
Harald Bamberger
|
1c385d22cd
|
Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212
|
2024-06-14 10:41:48 +02:00 |
|
|
Harald Bamberger
|
0e5d4b30ed
|
Merge branch 'master' into feature-37133/Gehaltsbaender
|
2024-06-13 13:26:48 +02:00 |
|
|
Harald Bamberger
|
4e233f760d
|
Merge branch 'master' into feature-37107/Fristenmanagement
|
2024-06-13 13:26:02 +02:00 |
|
|
Cris
|
cd0eacf947
|
Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung'
|
2024-06-11 13:52:03 +02:00 |
|
|
Cris
|
9652f48044
|
Added phrases 'zugeklappt', 'softwareliste', 'raumverfuegbarkeit'
|
2024-06-03 16:27:31 +02:00 |
|
|
Cris
|
c4c17f69c7
|
Added phrase softwaretypKurzbz
|
2024-05-14 13:41:33 +02:00 |
|
|
Cris
|
6d728ae0e7
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
|
2024-05-13 12:07:37 +02:00 |
|
|
Cris
|
5643607845
|
Added phrases 'statusErfolgreichUebertragen' and 'statusUebertragenMsg' to Softwarebereitstellung app
|
2024-05-13 11:06:32 +02:00 |
|
|
Werner Masik
|
3b06519f2f
|
updated phrases for salary range
|
2024-04-24 15:25:42 +02:00 |
|
|
Cris
|
f51f006377
|
Corrected phrase anmerkungIntern
|
2024-04-10 14:07:41 +02:00 |
|
|
Harald Bamberger
|
3b41df5ddc
|
Merge branch 'master' into feature-37107/Fristenmanagement
|
2024-04-09 10:44:02 +02:00 |
|
|
Werner Masik
|
f2ba0fd469
|
update phrases and added events for fristenmanagement
|
2024-04-07 00:33:25 +02:00 |
|
|
ma0048
|
753a193be1
|
- added phrases for bpks details
|
2024-04-04 15:41:18 +02:00 |
|
|
Cris
|
9907ee2267
|
Added phrase global/zeilenAuswaehlen
|
2024-04-03 11:45:43 +02:00 |
|
|
Cris
|
ba1fa6add4
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-03-28 13:20:51 +01:00 |
|
|
Cris
|
d34f5b92f4
|
Added new phrases for softwarebereitstellung- and for core app
|
2024-03-28 13:14:34 +01:00 |
|
|
Harald Bamberger
|
9f2dd82009
|
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
|
2024-03-25 13:08:10 +01:00 |
|
|
Harald Bamberger
|
7bdf5b832b
|
Merge branch 'master' into feature-36016/Studstatus_QMB
|
2024-03-12 11:32:25 +01:00 |
|
|
Harald Bamberger
|
9504b713fc
|
add missing insertvon to phrases definition
|
2024-03-12 11:31:12 +01:00 |
|
|
Harald Bamberger
|
d5d190777a
|
Merge branch 'feature-34543/UX_Template'
|
2024-03-05 16:46:48 +01:00 |
|
|
cgfhtw
|
2d2098984a
|
Pause feature
|
2024-02-29 08:34:58 +01:00 |
|
|
Cris
|
f94b1700e7
|
Renamed filter- and phrases app for Fhc-Core-Extension
Renamed from extension to fhctemplate
|
2024-02-28 13:38:59 +01:00 |
|
|
Cris
|
c232eddf89
|
Added filter and phrases for Fhc-Core-Extension
|
2024-02-22 11:17:27 +01:00 |
|
|
ma0048
|
6f92698631
|
- bewerbungstool payments uebersetzungen anpassungen
|
2024-02-20 17:01:49 +01:00 |
|
|
Werner Masik
|
cd64df28bb
|
added phrase for habilitation
|
2024-02-20 15:02:14 +01:00 |
|
|
cgfhtw
|
ab2fc11797
|
PDF Download Wiederholung Deadline
|
2024-02-16 11:44:27 +01:00 |
|
|
Cris
|
565f89c884
|
Added phrases anrechnung, geloescht and aenderungGespeichert
|
2024-02-13 10:51:37 +01:00 |
|
|
Andreas Österreicher
|
b4d6a46426
|
Fixed Typo in phrase
|
2024-02-09 15:18:14 +01:00 |
|
|
Andreas Österreicher
|
f5dacefbbe
|
Merge branch 'master' into feature-36028/uebersetzungen_zahlungen
|
2024-02-09 12:50:00 +01:00 |
|
|
Andreas Österreicher
|
752408aa3a
|
Fixed LineEndings
|
2024-02-09 12:49:14 +01:00 |
|
|
kindlm
|
36d4879b90
|
Hinweistext für Lehrauftragsannahme ergänzt
|
2024-02-07 16:35:21 +01:00 |
|
|
Andreas Österreicher
|
bea14724b0
|
Phrasen für Anrechnungen korrigiert
|
2024-01-30 16:56:19 +01:00 |
|
|
Andreas Österreicher
|
1d779feb4b
|
Merge branch 'feature-35202/internationalisierungsmassnahmen_wording_anpassen_fuer_akzeptieren'
|
2024-01-26 10:50:59 +01:00 |
|
|
ma0048
|
cd37972cad
|
- ubersetzuengen hinzugefuegt
|
2024-01-25 12:54:57 +01:00 |
|
|
Werner Masik
|
304caf9157
|
added time recording query
|
2024-01-18 12:30:35 +01:00 |
|
|
Harald Bamberger
|
49d24d74b0
|
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
|
2024-01-10 13:54:06 +01:00 |
|
|
Andreas Österreicher
|
2e742a7913
|
Merge branch 'feature-29144/Prestudent_status_nach_Bismeldung_sperren_2'
|
2023-12-21 13:29:02 +01:00 |
|
|
Harald Bamberger
|
5bfa8ca53c
|
Merge branch 'feature-35066/Studstatus_divers'
|
2023-12-20 19:57:33 +01:00 |
|
|
ma0048
|
ef117fbe12
|
- neue vorlage beim akzeptieren
- neuer filter
- button "alle geplanten markieren"
|
2023-12-20 16:02:44 +01:00 |
|
|
Andreas Österreicher
|
29d7a97ee8
|
Wording korrigiert
|
2023-12-20 14:26:30 +01:00 |
|
|
Andreas Österreicher
|
72217d9793
|
Merge branch 'master' into feature-29144/Prestudent_status_nach_Bismeldung_sperren_2
|
2023-12-20 14:06:18 +01:00 |
|